diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/kms_fbcon_fbt.c | 27 |
1 files changed, 25 insertions, 2 deletions
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)); } } |