[igt-dev] [PATCH i-g-t 1/2] tests/i915_pm_dc: Move PSR checks back to individual subtests

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala at linux.intel.com>

The dpms tests don't need PSR. So move the PSR check back into
the subtests that need it.

Cc: José Roberto de Souza <jose.souza at intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
Fixes: 6cbe6af372a0 ("tests/i915_pm_dc: Use psr_sink_support instead of reimplement it again")
Signed-off-by: Ville Syrjälä <ville.syrjala at linux.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 afcc10bc7e20..6975f165be7f 100644
--- a/tests/i915/i915_pm_dc.c
+++ b/tests/i915/i915_pm_dc.c
@@ -393,7 +393,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);
 
@@ -405,6 +404,7 @@ 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_1));
 		test_dc3co_vpb_simulation(&data);
 	}
 
@@ -412,6 +412,7 @@ int main(int argc, char *argv[])
 		     "while PSR is active");
 	igt_subtest("dc5-psr") {
 		data.op_psr_mode = PSR_MODE_1;
+		igt_require(psr_sink_support(data.debugfs_fd, PSR_MODE_1));
 		psr_enable(data.debugfs_fd, data.op_psr_mode);
 		test_dc_state_psr(&data, CHECK_DC5);
 	}
@@ -420,6 +421,7 @@ int main(int argc, char *argv[])
 		     "while PSR is active");
 	igt_subtest("dc6-psr") {
 		data.op_psr_mode = PSR_MODE_1;
+		igt_require(psr_sink_support(data.debugfs_fd, PSR_MODE_1));
 		psr_enable(data.debugfs_fd, data.op_psr_mode);
 		igt_require_f(igt_pm_pc8_plus_residencies_enabled(data.msr_fd),
 			      "PC8+ residencies not supported\n");
-- 
2.24.1