[igt-dev] [PATCH i-g-t v2 2/2] tests/i915_pm_dc: psr required only for dc*-psr tests

[Anshuman Gupta]

DPMS igt tests were skipping for non-psr panels due to
psr_sink_support sink check added to igt_fixture() at
commit <6cbe6af372a01be63121056679d540436ffd0b64>.
DPMS dc state igt test don't require psr_sink_support, as it
validates DC states with all display being DPMS off.
Removing the psr sink check from igt_fixture and adding
it only for dc*- psr tests.

v2:
- Adding psr sink check to dc3co and moving ahead it
  in dc5/6 psr tests. [Jose]

Cc: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
Cc: José Roberto de Souza <jose.souza at intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta at intel.com>
---
 tests/i915/i915_pm_dc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/i915/i915_pm_dc.c b/tests/i915/i915_pm_dc.c
index fc6faa16..dcaf82f8 100644
--- a/tests/i915/i915_pm_dc.c
+++ b/tests/i915/i915_pm_dc.c
@@ -398,7 +398,6 @@ int main(int argc, char *argv[])
 		igt_require(igt_setup_runtime_pm(data.drm_fd));
 		igt_require(igt_pm_dmc_loaded(data.debugfs_fd));
 		igt_display_require(&data.display, data.drm_fd);
-		igt_require(psr_sink_support(data.debugfs_fd, PSR_MODE_1));
 		/* Make sure our Kernel supports MSR and the module is loaded */
 		igt_require(igt_kmod_load("msr", NULL) == 0);
 
@@ -410,12 +409,14 @@ int main(int argc, char *argv[])
 	igt_describe("In this test we make sure that system enters DC3CO "
 		     "when PSR2 is active and system is in SLEEP state");
 	igt_subtest("dc3co-vpb-simulation") {
+		igt_require(psr_sink_support(data.debugfs_fd, PSR_MODE_2));
 		test_dc3co_vpb_simulation(&data);
 	}
 
 	igt_describe("This test validates display engine entry to DC5 state "
 		     "while PSR is active");
 	igt_subtest("dc5-psr") {
+		igt_require(psr_sink_support(data.debugfs_fd, PSR_MODE_1));
 		data.op_psr_mode = PSR_MODE_1;
 		psr_enable(data.debugfs_fd, data.op_psr_mode);
 		test_dc_state_psr(&data, CHECK_DC5);
@@ -424,6 +425,7 @@ int main(int argc, char *argv[])
 	igt_describe("This test validates display engine entry to DC6 state "
 		     "while PSR is active");
 	igt_subtest("dc6-psr") {
+		igt_require(psr_sink_support(data.debugfs_fd, PSR_MODE_1));
 		data.op_psr_mode = PSR_MODE_1;
 		psr_enable(data.debugfs_fd, data.op_psr_mode);
 		igt_require_f(igt_pm_pc8_plus_residencies_enabled(data.msr_fd),
-- 
2.24.0