From 14f4879bdfe58b4dbc80afd7af99daeeca6f6506 Mon Sep 17 00:00:00 2001 From: José Roberto de Souza Date: Mon, 7 Jan 2019 09:50:05 -0800 Subject: tests/fbcon_fbt: Add and user psr_long_wait_update() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When fbcon is enabled, PSR will be active between cursor blinks so what it should really use to test PSR is psr_wait_entry(), so a new feature callback was added. But the fbcon cursor blinks at 5hz what give us 200ms between each screen update what make psr_wait_update() prone to fail the test because it timed out before a blink could happen, so here adding and using psr_long_wait_update() that have a longer timeout. v3: - 3 previous patches squashed in this one (Maarten) - Back to !feature->wait_until_enabled() to test feature state when all CRTCS are disabled(Dhinakaran) Cc: Dhinakaran Pandiyan Cc: Rodrigo Vivi Cc: Maarten Lankhorst Reviewed-by: Dhinkaran Pandiyan Signed-off-by: José Roberto de Souza --- lib/igt_psr.c | 5 +++++ lib/igt_psr.h | 1 + 2 files changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/igt_psr.c b/lib/igt_psr.c index b5847bfd..b92ea73f 100644 --- a/lib/igt_psr.c +++ b/lib/igt_psr.c @@ -54,6 +54,11 @@ bool psr_wait_update(int debugfs_fd, enum psr_mode mode) return igt_wait(!psr_active_check(debugfs_fd, mode), 40, 10); } +bool psr_long_wait_update(int debugfs_fd, enum psr_mode mode) +{ + return igt_wait(!psr_active_check(debugfs_fd, mode), 500, 10); +} + static ssize_t psr_write(int debugfs_fd, const char *buf) { return igt_sysfs_write(debugfs_fd, "i915_edp_psr_debug", buf, diff --git a/lib/igt_psr.h b/lib/igt_psr.h index 49599cf8..ca385736 100644 --- a/lib/igt_psr.h +++ b/lib/igt_psr.h @@ -37,6 +37,7 @@ enum psr_mode { bool psr_wait_entry(int debugfs_fd, enum psr_mode mode); bool psr_wait_update(int debugfs_fd, enum psr_mode mode); +bool psr_long_wait_update(int debugfs_fd, enum psr_mode mode); bool psr_enable(int debugfs_fd, enum psr_mode); bool psr_disable(int debugfs_fd); bool psr_sink_support(int debugfs_fd, enum psr_mode); -- cgit v1.2.3