[i-g-t] HAX/DO_NOT_MERGE: Fix to run DRRS subtests New rev

[Bhanuprakash Modem]

Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
---
 lib/i915/intel_drrs.c                    |  2 +-
 tests/intel-ci/blacklist.txt             |  4 ----
 tests/intel-ci/fast-feedback.testlist    |  6 ++++++
 tests/intel-ci/xe-fast-feedback.testlist |  6 ++++++
 tests/intel/kms_dirtyfb.c                | 16 +++++++++++++++-
 tests/intel/kms_frontbuffer_tracking.c   |  1 +
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/lib/i915/intel_drrs.c b/lib/i915/intel_drrs.c
index 9c6aefbf6..ac8dd5e61 100644
--- a/lib/i915/intel_drrs.c
+++ b/lib/i915/intel_drrs.c
@@ -30,7 +30,7 @@ bool intel_is_drrs_supported(int device, enum pipe pipe)
 	igt_debugfs_simple_read(dir, "i915_drrs_status", buf, sizeof(buf));
 	close(dir);
 
-	return strstr(buf, "DRRS enabled: yes");
+	return strstr(buf, "DRRS capable: yes");
 }
 
 /**
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index 4427804d5..4c4d72539 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt
@@ -69,10 +69,6 @@ igt at sysfs_timeslice_duration@off
 igt at gen7_exec_parse@.*lri.*
 igt at gem_exec_alignment@pi-shared
 ###############################################
-# There are no DRRS capable displays in CI lab
-###############################################
-igt at kms_frontbuffer_tracking@.*drrs.*
-###############################################
 # Tends to generate invalid configurations
 # using CCS planes or configurations that
 # exceed HW capabilities resulting in sporadic
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index 662e49cc3..004fe337d 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -102,6 +102,7 @@ igt at kms_cursor_legacy@basic-flip-after-cursor-varying-size
 igt at kms_cursor_legacy@basic-flip-before-cursor-atomic
 igt at kms_cursor_legacy@basic-flip-before-cursor-legacy
 igt at kms_cursor_legacy@basic-flip-before-cursor-varying-size
+igt at kms_dirtyfb@drrs-dirtyfb-ioctl
 igt at kms_dsc@dsc-basic
 igt at kms_flip@basic-flip-vs-dpms
 igt at kms_flip@basic-flip-vs-modeset
@@ -112,6 +113,10 @@ igt at kms_force_connector_basic@force-edid
 igt at kms_force_connector_basic@force-load-detect
 igt at kms_force_connector_basic@prune-stale-modes
 igt at kms_frontbuffer_tracking@basic
+igt at kms_frontbuffer_tracking@drrs-1p-rte
+igt at kms_frontbuffer_tracking@fbcdrrs-1p-rte
+igt at kms_frontbuffer_tracking@psrdrrs-1p-rte
+igt at kms_frontbuffer_tracking@fbcpsrdrrs-1p-rte
 igt at kms_hdmi_inject@inject-audio
 igt at kms_pipe_crc_basic@compare-crc-sanitycheck-xr24
 igt at kms_pipe_crc_basic@compare-crc-sanitycheck-nv12
@@ -128,6 +133,7 @@ igt at kms_psr@psr-cursor-plane-move
 igt at kms_psr@psr-sprite-plane-onoff
 igt at kms_psr@psr-primary-mmap-gtt
 igt at kms_setmode@basic-clone-single-crtc
+igt at kms_vrr@seamless-rr-switch-drrs
 igt at i915_pm_rps@basic-api
 igt at prime_self_import@basic-llseek-bad
 igt at prime_self_import@basic-llseek-size
diff --git a/tests/intel-ci/xe-fast-feedback.testlist b/tests/intel-ci/xe-fast-feedback.testlist
index 6c01374c1..75bccc86c 100644
--- a/tests/intel-ci/xe-fast-feedback.testlist
+++ b/tests/intel-ci/xe-fast-feedback.testlist
@@ -200,6 +200,7 @@ igt at kms_cursor_legacy@basic-flip-after-cursor-varying-size
 igt at kms_cursor_legacy@basic-flip-before-cursor-atomic
 igt at kms_cursor_legacy@basic-flip-before-cursor-legacy
 igt at kms_cursor_legacy@basic-flip-before-cursor-varying-size
+igt at kms_dirtyfb@drrs-dirtyfb-ioctl
 igt at kms_dsc@dsc-basic
 igt at kms_flip@basic-flip-vs-dpms
 igt at kms_flip@basic-flip-vs-modeset
@@ -209,6 +210,10 @@ igt at kms_force_connector_basic@force-connector-state
 igt at kms_force_connector_basic@force-edid
 igt at kms_force_connector_basic@prune-stale-modes
 igt at kms_frontbuffer_tracking@basic
+igt at kms_frontbuffer_tracking@drrs-1p-rte
+igt at kms_frontbuffer_tracking@fbcdrrs-1p-rte
+igt at kms_frontbuffer_tracking@psrdrrs-1p-rte
+igt at kms_frontbuffer_tracking@fbcpsrdrrs-1p-rte
 igt at kms_hdmi_inject@inject-audio
 igt at kms_pipe_crc_basic@compare-crc-sanitycheck-xr24
 igt at kms_pipe_crc_basic@compare-crc-sanitycheck-nv12
@@ -221,6 +226,7 @@ igt at kms_prop_blob@basic
 igt at kms_psr@psr-primary-page-flip
 igt at kms_psr@psr-cursor-plane-move
 igt at kms_psr@psr-sprite-plane-onoff
+igt at kms_vrr@seamless-rr-switch-drrs
 
 # All tests that do module unloading and reloading are executed last.
 # They will sometimes reveal issues of earlier tests leaving the
diff --git a/tests/intel/kms_dirtyfb.c b/tests/intel/kms_dirtyfb.c
index 26b82e50a..5a5fe96e0 100644
--- a/tests/intel/kms_dirtyfb.c
+++ b/tests/intel/kms_dirtyfb.c
@@ -139,6 +139,19 @@ static void enable_feature(data_t *data)
 	}
 }
 
+static void drrs_print_status(data_t *data)
+{
+       char buf[256];
+       int dir;
+       enum pipe pipe = data->pipe;
+
+       dir = igt_debugfs_pipe_dir(data->drm_fd, pipe, O_DIRECTORY);
+       igt_require_fd(dir);
+       igt_debugfs_simple_read(dir, "i915_drrs_status", buf, 256);
+       close(dir);
+       igt_info("DRRS STATUS :\n%s\n", buf);
+}
+
 static void check_feature(data_t *data)
 {
 	switch (data->feature) {
@@ -154,7 +167,8 @@ static void check_feature(data_t *data)
 			     "PSR still disabled\n");
 		break;
 	case FEATURE_DRRS:
-		igt_assert_f(intel_is_drrs_inactive(data->drm_fd, data->pipe),
+		drrs_print_status(data);
+		igt_assert_f(!intel_is_drrs_inactive(data->drm_fd, data->pipe),
 			     "DRRS INACTIVE\n");
 		break;
 	case FEATURE_DEFAULT:
diff --git a/tests/intel/kms_frontbuffer_tracking.c b/tests/intel/kms_frontbuffer_tracking.c
index 912cca3f8..c00b55753 100644
--- a/tests/intel/kms_frontbuffer_tracking.c
+++ b/tests/intel/kms_frontbuffer_tracking.c
@@ -2983,6 +2983,7 @@ static void prepare_subtest_data(const struct test_mode *t,
 	need_modeset = enable_features_for_test(t);
 	if (need_modeset)
 		igt_display_commit(&drm.display);
+	drrs_print_status();
 }
 
 static void prepare_subtest_screens(const struct test_mode *t)
-- 
2.43.0