Skip to contentSkip to conversation

Enabling PC8+ residency for ICL and GEN9.

PATCH In review Anshuman Gupta 2 participants 4 messages Feb 21, 2019 – Feb 25, 2019

lore
Share & tools
lore
#0 lore raw

cover Enabling PC8+ residency for ICL and GEN9.

This patch series enable PC8+ residency test, earlier these tests were only enabled for Haswell and Broadwell.

Anshuman Gupta (2):
tests/pm_rpm: Enable PC8+ residency test for ICL and GEN9. tests/pm_rpm: Enable modeset-pc8-residency-stress for ICL and GEN9.

 tests/pm_rpm.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
Signature · 6 lines
2.7.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#1 lore raw

PATCH 1/2 tests/pm_rpm: Enable PC8+ residency test for ICL and GEN9.

Enabled has_pc8 global for ICL and Gen9.
Added PC8+ residency test for display enabled case as well.

---
 tests/pm_rpm.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
tests/pm_rpm.c +9 -4
index be296f5..c84f199 100644
@@ -686,7 +686,8 @@ static void setup_pc8(void)
 	has_pc8 = false;
 
 	/* Only Haswell supports the PC8 feature. */
-	if (!IS_HASWELL(ms_data.devid) && !IS_BROADWELL(ms_data.devid))
+	if (!IS_HASWELL(ms_data.devid) && !IS_BROADWELL(ms_data.devid)
+		&& !IS_GEN9(ms_data.devid) && !IS_ICELAKE(ms_data.devid))
 		return;
 
 	/* Make sure our Kernel supports MSR and the module is loaded. */
@@ -806,11 +807,15 @@ static void pc8_residency_subtest(void)
 	igt_assert_f(pc8_plus_residency_changed(30),
 		     "Machine is not reaching PC8+ states, please check its "
 		     "configuration.\n");
-
-	/* Make sure PC8+ residencies stop! */
 	enable_one_screen(&ms_data);
-	igt_assert_f(!pc8_plus_residency_changed(10),
+	if (IS_HASWELL(ms_data.devid) && IS_BROADWELL(ms_data.devid)) {
+		/* Make sure PC8+ residencies stop! */
+		igt_assert_f(!pc8_plus_residency_changed(10),
+		     "PC8+ residency didn't stop with screen enabled.\n");
+	} else {
+		igt_assert_f(pc8_plus_residency_changed(10),
 		     "PC8+ residency didn't stop with screen enabled.\n");
+	}
 }
 
 static void modeset_subtest(enum screen_type type, int rounds, int wait_flags)
Signature · 6 lines
2.7.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#2 lore raw

Re: [igt-dev] [PATCH i-g-t 1/2] tests/pm_rpm: Enable PC8+ residency test for ICL and GEN9.

Quoted 13 lines · Anshuman Gupta

Enabled has_pc8 global for ICL and Gen9.
Added PC8+ residency test for display enabled case as well.

---
 tests/pm_rpm.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
tests/pm_rpm.c +0 -0
index be296f5..c84f199 100644

tests/pm_rpm.c static void setup_pc8(void) · line 690

Quoted 6 lines
tests/pm_rpm.c +2 -1
@@ -686,7 +686,8 @@ static void setup_pc8(void)
 	has_pc8 = false;
 
 	/* Only Haswell supports the PC8 feature. */
-	if (!IS_HASWELL(ms_data.devid) && !IS_BROADWELL(ms_data.devid))
+	if (!IS_HASWELL(ms_data.devid) && !IS_BROADWELL(ms_data.devid)
+		&& !IS_GEN9(ms_data.devid) && !IS_ICELAKE(ms_data.devid))

Could be made future proof by

	if (!HSW && !BDW && GEN<9)
		return;

tests/pm_rpm.c static void pc8_residency_subtest(void) · line 811

Quoted 12 lines
tests/pm_rpm.c +1 -3
 		return;
 
 	/* Make sure our Kernel supports MSR and the module is loaded. */
@@ -806,11 +807,15 @@ static void pc8_residency_subtest(void)
 	igt_assert_f(pc8_plus_residency_changed(30),
 		     "Machine is not reaching PC8+ states, please check its "
 		     "configuration.\n");
-
-	/* Make sure PC8+ residencies stop! */
 	enable_one_screen(&ms_data);
-	igt_assert_f(!pc8_plus_residency_changed(10),
+	if (IS_HASWELL(ms_data.devid) && IS_BROADWELL(ms_data.devid)) {

Perhaps add a pc8_needs_screen_off flag? As it's also needed in the next patch.

Since PC8 doesn't require the screen to be off on GEN9+ we may also need a subtest for that case, but I'm not sure what's the exact requirement to get into PC8 in that case (how many displays can be enabled, in what resolution).

Quoted 13 lines
tests/pm_rpm.c +6 -0
+		/* Make sure PC8+ residencies stop! */
+		igt_assert_f(!pc8_plus_residency_changed(10),
+		     "PC8+ residency didn't stop with screen enabled.\n");
+	} else {
+		igt_assert_f(pc8_plus_residency_changed(10),
 		     "PC8+ residency didn't stop with screen enabled.\n");
+	}
 }
 
 static void modeset_subtest(enum screen_type type, int rounds, int wait_flags)
Signature · 1 line
2.7.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#3 lore raw

PATCH 2/2 tests/pm_rpm: Enable modeset-pc8-residency-stress for ICL and GEN9.

In reply to Anshuman Gupta

Do not assert failure if PC8 state achieved with display enabled.

---
 tests/pm_rpm.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
tests/pm_rpm.c +7 -2
index c84f199..878b63b 100644
@@ -846,8 +846,13 @@ static void modeset_subtest(enum screen_type type, int rounds, int wait_flags)
 		igt_require(enable_one_screen_with_type(&ms_data, type));
 		if (wait_flags & WAIT_STATUS)
 			igt_assert(wait_for_active());
-		if (wait_flags & WAIT_PC8_RES)
-			igt_assert(!pc8_plus_residency_changed(5));
+		if (wait_flags & WAIT_PC8_RES) {
+			if (IS_HASWELL(ms_data.devid) &&
+				IS_BROADWELL(ms_data.devid))
+				igt_assert(!pc8_plus_residency_changed(5));
+			else
+				igt_assert(pc8_plus_residency_changed(5));
+		}
 		if (wait_flags & WAIT_EXTRA)
 			sleep(5);
 	}
Signature · 6 lines
2.7.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev