[igt-dev] [PATCH i-g-t v4 3/7] lib/psr: Rename psr_wait_exit to psr_wait_update

José Roberto de Souza jose.souza at intel.com
Thu Jan 17 23:59:45 UTC 2019


This is a initial preparation for PSR2 test support, as in PSR2 a
update to screen could mean that PSR is still active and the screen
will be update by a selective update this renamed is necessary.

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
---
 lib/igt_psr.c                    | 2 +-
 lib/igt_psr.h                    | 2 +-
 tests/kms_frontbuffer_tracking.c | 3 ++-
 tests/kms_psr.c                  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index 83c5b986..5edec6a2 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -42,7 +42,7 @@ bool psr_wait_entry(int debugfs_fd)
 	return igt_wait(psr_active(debugfs_fd, true), 500, 20);
 }
 
-bool psr_wait_exit(int debugfs_fd)
+bool psr_wait_update(int debugfs_fd)
 {
 	return igt_wait(psr_active(debugfs_fd, false), 40, 10);
 }
diff --git a/lib/igt_psr.h b/lib/igt_psr.h
index d3336c2d..62c680ee 100644
--- a/lib/igt_psr.h
+++ b/lib/igt_psr.h
@@ -31,7 +31,7 @@
 #define PSR_STATUS_MAX_LEN 512
 
 bool psr_wait_entry(int debugfs_fd);
-bool psr_wait_exit(int debugfs_fd);
+bool psr_wait_update(int debugfs_fd);
 bool psr_enable(int debugfs_fd);
 bool psr_disable(int debugfs_fd);
 bool psr_sink_support(int debugfs_fd);
diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
index 42f4c289..cd7dda91 100644
--- a/tests/kms_frontbuffer_tracking.c
+++ b/tests/kms_frontbuffer_tracking.c
@@ -1625,7 +1625,8 @@ static void do_status_assertions(int flags)
 		igt_assert_f(psr_wait_entry(drm.debugfs),
 			     "PSR still disabled\n");
 	else if (flags & ASSERT_PSR_DISABLED)
-		igt_assert_f(psr_wait_exit(drm.debugfs), "PSR still enabled\n");
+		igt_assert_f(psr_wait_update(drm.debugfs),
+			     "PSR still enabled\n");
 }
 
 static void __do_assertions(const struct test_mode *t, int flags,
diff --git a/tests/kms_psr.c b/tests/kms_psr.c
index 855679b0..fb3bd7a4 100644
--- a/tests/kms_psr.c
+++ b/tests/kms_psr.c
@@ -289,7 +289,7 @@ static void run_test(data_t *data)
 		expected = "screen GREEN";
 		break;
 	}
-	igt_assert(psr_wait_exit(data->debugfs_fd));
+	igt_assert(psr_wait_update(data->debugfs_fd));
 	manual(expected);
 }
 
-- 
2.20.1



More information about the igt-dev mailing list