[PATCH i-g-t v2 1/4] tests/intel/kms_fbc_dirty_rect: Use per-output PSR check before disabling

[Jeevan B <jeevan.b@intel.com>]

Pass output to psr_sink_support so PSR/PR is disabled only when
the sink supports it. Using NULL performs a global check and can
be incorrect on multi-eDP systems.

v2: Update title, include PR and output name in log, check
    psr_disable return value.

Signed-off-by: Jeevan B <jeevan.b@intel.com>
---
 tests/intel/kms_fbc_dirty_rect.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/intel/kms_fbc_dirty_rect.c b/tests/intel/kms_fbc_dirty_rect.c
index efbd46985..c58ab3465 100644
--- a/tests/intel/kms_fbc_dirty_rect.c
+++ b/tests/intel/kms_fbc_dirty_rect.c
@@ -414,11 +414,15 @@ static bool prepare_test(data_t *data)
 	igt_require_f(intel_fbc_supported(data->crtc),
 		      "FBC not supported by the chipset on pipe\n");
 
-	if (psr_sink_support(data->drm_fd, data->debugfs_fd, PSR_MODE_1, NULL) ||
-	    psr_sink_support(data->drm_fd, data->debugfs_fd, PSR_MODE_2, NULL) ||
-	    psr_sink_support(data->drm_fd, data->debugfs_fd, PR_MODE, NULL)) {
-		igt_info("PSR is supported by the sink. Disabling PSR to test Dirty FBC functionality.\n");
-		psr_disable(data->drm_fd, data->debugfs_fd, data->output);
+	if (psr_sink_support(data->drm_fd, data->debugfs_fd, PSR_MODE_1, data->output) ||
+	    psr_sink_support(data->drm_fd, data->debugfs_fd, PSR_MODE_2, data->output) ||
+	    psr_sink_support(data->drm_fd, data->debugfs_fd, PR_MODE, data->output)) {
+		igt_info("PSR/PR supported on %s, disabling for dirty FBC test\n",
+			 igt_output_name(data->output));
+
+		igt_require_f(psr_disable(data->drm_fd, data->debugfs_fd, data->output),
+			      "Failed to disable PSR/PR on %s\n",
+			      igt_output_name(data->output));
 	}
 
 	if (data->feature & FEATURE_FBC)
-- 
2.43.0