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 + tests/kms_fbcon_fbt.c | 27 +++++++++++++++++++++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) 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); diff --git a/tests/kms_fbcon_fbt.c b/tests/kms_fbcon_fbt.c index 89b02540..23b5f88a 100644 --- a/tests/kms_fbcon_fbt.c +++ b/tests/kms_fbcon_fbt.c @@ -130,6 +130,21 @@ static bool fbc_wait_until_enabled(int debugfs_fd) return r; } +static bool fbc_wait_until_update(int debugfs) +{ + /* + * FBC is not expected to be enabled because fbcon do not uses a tiled + * framebuffer so a fence can not be setup on the framebuffer and FBC + * code requires a fence to accurate track frontbuffer modifications + * (what maybe is not necessary anymore as we now have + * intel_fbc_invalidate()/flush()). + * + * If one day fbcon starts to use a tiled framebuffer we would need to + * check the 'Compressing' status as in each blink it would be disabled. + */ + return !fbc_wait_until_enabled(debugfs); +} + typedef bool (*connector_possible_fn)(drmModeConnectorPtr connector); static void set_mode_for_one_screen(struct drm_info *drm, struct igt_fb *fb, @@ -196,6 +211,11 @@ static bool psr_supported_on_chipset(int debugfs_fd) return psr_sink_support(debugfs_fd, PSR_MODE_1); } +static bool psr_wait_until_update(int debugfs_fd) +{ + return psr_long_wait_update(debugfs_fd, PSR_MODE_1); +} + static void disable_features(int debugfs_fd) { igt_set_module_param_int("enable_fbc", 0); @@ -215,16 +235,19 @@ static inline void psr_debugfs_enable(int debugfs_fd) struct feature { bool (*supported_on_chipset)(int debugfs_fd); bool (*wait_until_enabled)(int debugfs_fd); + bool (*wait_until_update)(int debugfs_fd); bool (*connector_possible_fn)(drmModeConnectorPtr connector); void (*enable)(int debugfs_fd); } fbc = { .supported_on_chipset = fbc_supported_on_chipset, .wait_until_enabled = fbc_wait_until_enabled, + .wait_until_update = fbc_wait_until_update, .connector_possible_fn = connector_can_fbc, .enable = fbc_modparam_enable, }, psr = { .supported_on_chipset = psr_supported_on_chipset, .wait_until_enabled = psr_wait_until_enabled, + .wait_until_update = psr_wait_until_update, .connector_possible_fn = connector_can_psr, .enable = psr_debugfs_enable, }; @@ -263,13 +286,13 @@ static void subtest(struct feature *feature, bool suspend) sleep(3); wait_user("Back to fbcon."); - igt_assert(!feature->wait_until_enabled(drm.debugfs_fd)); + igt_assert(feature->wait_until_update(drm.debugfs_fd)); if (suspend) { igt_system_suspend_autoresume(SUSPEND_STATE_MEM, SUSPEND_TEST_NONE); sleep(5); - igt_assert(!feature->wait_until_enabled(drm.debugfs_fd)); + igt_assert(feature->wait_until_update(drm.debugfs_fd)); } } -- cgit v1.2.3