[igt-dev] [PATCH i-g-t v4 2/2] tests/i915/i915_pm_rpm: modeset-pc8-residency-stress

[Anshuman Gupta]

Introduced pc8_needs_screen_off flag in order to differentiate
between HASWELL/BROADWELL and AT_LEAST_GEN9. GEN9 onwards
PC8+ residency does't require display to be turned on.

v3:Removed pc8_needs_screen_off from mode_set_data structure,
   made it global, aligning to has_pc8 and has_runtime_pm globals. [Ram]
   Made modeset_subtest() to tests PC8+ residency after enabling a screen,
   earlier it expects PC8+ residency to stop on HSW/BDW.

v4:Fixed conditional code for pc8_needs_screen_off. [Ram]
   Used macros for timeout values, given to PC8+ residency check function. [Ram]
   Changed the screen on timeout to check pc8+ residency to 10 seconds.

Signed-off-by: Anshuman Gupta <anshuman.gupta at intel.com>
---
 tests/i915/i915_pm_rpm.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
index 70e8ac7..092ee64 100644
--- a/tests/i915/i915_pm_rpm.c
+++ b/tests/i915/i915_pm_rpm.c
@@ -907,7 +907,7 @@ static void modeset_subtest(enum screen_type type, int rounds, int wait_flags)
 		if (wait_flags & WAIT_STATUS)
 			igt_assert(wait_for_suspended());
 		if (wait_flags & WAIT_PC8_RES)
-			igt_assert(pc8_plus_residency_changed(30));
+			igt_assert(pc8_plus_residency_changed(TIME_OUT_SEC_30));
 		if (wait_flags & WAIT_EXTRA)
 			sleep(5);
 
@@ -917,7 +917,13 @@ static void modeset_subtest(enum screen_type type, int rounds, int wait_flags)
 		if (wait_flags & WAIT_STATUS)
 			igt_assert(wait_for_active());
 		if (wait_flags & WAIT_PC8_RES)
-			igt_assert(!pc8_plus_residency_changed(5));
+			if (pc8_needs_screen_off)
+				igt_assert(!pc8_plus_residency_changed
+					   (TIME_OUT_SEC_5));
+			else
+				igt_assert(pc8_plus_residency_changed
+					   (TIME_OUT_SEC_10));
+
 		if (wait_flags & WAIT_EXTRA)
 			sleep(5);
 	}
-- 
2.7.4