Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t 1/4] lib/igt_aux: Let's use the official mem_sleep names
@ 2022-07-13 15:52 Rodrigo Vivi
  2022-07-13 15:52 ` [igt-dev] [PATCH i-g-t 2/4] tests/i915/i915_suspend: Be more specific on the S3 mem_sleep requirement Rodrigo Vivi
                   ` (6 more replies)
  0 siblings, 7 replies; 13+ messages in thread
From: Rodrigo Vivi @ 2022-07-13 15:52 UTC (permalink / raw)
  To: igt-dev; +Cc: Rodrigo Vivi

Mixing the names with the state names can cause confusion.
Let's stick with the official names.

Cc: Riana Tauro <riana.tauro@intel.com>
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 lib/igt_aux.c             | 8 ++++----
 lib/igt_aux.h             | 6 +++---
 tests/i915/i915_suspend.c | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index 35c67f10..5129d9f0 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -712,9 +712,9 @@ static const char *suspend_test_name[] = {
 };
 
 static const char *mem_sleep_name[] = {
-	[MEM_SLEEP_FREEZE] = "s2idle",
-	[MEM_SLEEP_STANDBY] = "shallow",
-	[MEM_SLEEP_MEM] = "deep"
+	[MEM_SLEEP_S2IDLE] = "s2idle",
+	[MEM_SLEEP_SHALLOW] = "shallow",
+	[MEM_SLEEP_DEEP] = "deep"
 };
 
 static enum igt_suspend_test get_suspend_test(int power_dir)
@@ -993,7 +993,7 @@ int igt_get_memsleep_state(void)
 		return MEM_SLEEP_NONE;
 	}
 
-	for (mem_sleep = MEM_SLEEP_FREEZE; mem_sleep < MEM_SLEEP_NUM; mem_sleep++) {
+	for (mem_sleep = MEM_SLEEP_S2IDLE; mem_sleep < MEM_SLEEP_NUM; mem_sleep++) {
 		if (strcmp(mem_sleep_name[mem_sleep], mem_sleep_state) == 0)
 			break;
 	}
diff --git a/lib/igt_aux.h b/lib/igt_aux.h
index af663d2c..9d5b7bd2 100644
--- a/lib/igt_aux.h
+++ b/lib/igt_aux.h
@@ -196,9 +196,9 @@ enum igt_suspend_test {
  */
 enum igt_mem_sleep {
 	MEM_SLEEP_NONE,
-	MEM_SLEEP_FREEZE,
-	MEM_SLEEP_STANDBY,
-	MEM_SLEEP_MEM,
+	MEM_SLEEP_S2IDLE,
+	MEM_SLEEP_SHALLOW,
+	MEM_SLEEP_DEEP,
 
 	/*<private>*/
 	MEM_SLEEP_NUM,
diff --git a/tests/i915/i915_suspend.c b/tests/i915/i915_suspend.c
index 23e451d3..f992d447 100644
--- a/tests/i915/i915_suspend.c
+++ b/tests/i915/i915_suspend.c
@@ -209,7 +209,7 @@ test_suspend_without_i915(int state)
 	igt_kmsg(KMSG_INFO "Unloading i915\n");
 	igt_assert_eq(igt_i915_driver_unload(),0);
 
-	igt_skip_on_f(igt_get_memsleep_state() == MEM_SLEEP_FREEZE && state > SUSPEND_STATE_FREEZE,
+	igt_skip_on_f(igt_get_memsleep_state() == MEM_SLEEP_S2IDLE && state > SUSPEND_STATE_FREEZE,
 		      "Platform default mem_sleep state is s2idle\n");
 	igt_system_suspend_autoresume(state, SUSPEND_TEST_NONE);
 
-- 
2.35.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2022-07-21 10:26 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-13 15:52 [igt-dev] [PATCH i-g-t 1/4] lib/igt_aux: Let's use the official mem_sleep names Rodrigo Vivi
2022-07-13 15:52 ` [igt-dev] [PATCH i-g-t 2/4] tests/i915/i915_suspend: Be more specific on the S3 mem_sleep requirement Rodrigo Vivi
2022-07-18  6:24   ` Anshuman Gupta
2022-07-13 15:52 ` [igt-dev] [PATCH i-g-t 3/4] lib/igt_aux: Introduce the ability to force S3 suspend state Rodrigo Vivi
2022-07-18  6:47   ` Anshuman Gupta
2022-07-18 21:42     ` Rodrigo Vivi
2022-07-19  5:20       ` Gupta, Anshuman
2022-07-13 15:52 ` [igt-dev] [PATCH i-g-t 4/4] test/i915/i915_suspend: Use SUSPEND_STATE_S3 to enforce S3 Rodrigo Vivi
2022-07-18  7:09   ` Anshuman Gupta
2022-07-13 18:58 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/4] lib/igt_aux: Let's use the official mem_sleep names Patchwork
2022-07-18  5:54 ` [igt-dev] [PATCH i-g-t 1/4] " Anshuman Gupta
2022-07-19 13:17 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/4] lib/igt_aux: Let's use the official mem_sleep names (rev2) Patchwork
2022-07-21 10:26 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/4] lib/igt_aux: Let's use the official mem_sleep names (rev3) Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox