diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/kms_fbcon_fbt.c | 15 | ||||
-rw-r--r-- | tests/kms_frontbuffer_tracking.c | 13 | ||||
-rw-r--r-- | tests/kms_psr.c | 8 |
3 files changed, 3 insertions, 33 deletions
diff --git a/tests/kms_fbcon_fbt.c b/tests/kms_fbcon_fbt.c index 0ad53266..2823b47a 100644 --- a/tests/kms_fbcon_fbt.c +++ b/tests/kms_fbcon_fbt.c @@ -168,19 +168,6 @@ static void set_mode_for_one_screen(struct drm_info *drm, struct igt_fb *fb, igt_assert_eq(rc, 0); } -static bool psr_supported_on_chipset(int debugfs_fd) -{ - char buf[PSR_STATUS_MAX_LEN]; - int ret; - - ret = igt_debugfs_simple_read(debugfs_fd, "i915_edp_psr_status", - buf, sizeof(buf)); - if (ret < 0) - return false; - - return strstr(buf, "Sink_Support: yes\n"); -} - static bool connector_can_psr(drmModeConnectorPtr connector) { return (connector->connector_type == DRM_MODE_CONNECTOR_eDP); @@ -239,7 +226,7 @@ struct feature { .connector_possible_fn = connector_can_fbc, .enable = fbc_modparam_enable, }, psr = { - .supported_on_chipset = psr_supported_on_chipset, + .supported_on_chipset = psr_sink_support, .wait_until_enabled = psr_wait_until_enabled, .connector_possible_fn = connector_can_psr, .enable = psr_debugfs_enable, diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index c366fecf..42f4c289 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -1417,17 +1417,6 @@ static void teardown_fbc(void) { } -static bool psr_sink_has_support(void) -{ - char buf[PSR_STATUS_MAX_LEN]; - - debugfs_read("i915_edp_psr_status", buf); - if (*buf == '\0') /* !HAS_PSR -> -ENODEV*/ - return false; - - return strstr(buf, "Sink_Support: yes\n"); -} - static void setup_psr(void) { if (prim_mode_params.output->config.connector->connector_type != @@ -1436,7 +1425,7 @@ static void setup_psr(void) return; } - if (!psr_sink_has_support()) { + if (!psr_sink_support(drm.debugfs)) { igt_info("Can't test PSR: not supported by sink.\n"); return; } diff --git a/tests/kms_psr.c b/tests/kms_psr.c index 20b69892..855679b0 100644 --- a/tests/kms_psr.c +++ b/tests/kms_psr.c @@ -191,13 +191,7 @@ static void fill_render(data_t *data, uint32_t handle, unsigned char color) static bool sink_support(data_t *data) { - char buf[PSR_STATUS_MAX_LEN]; - - igt_debugfs_simple_read(data->debugfs_fd, "i915_edp_psr_status", - buf, sizeof(buf)); - - return data->with_psr_disabled || - strstr(buf, "Sink_Support: yes\n"); + return data->with_psr_disabled || psr_sink_support(data->debugfs_fd); } static bool psr_wait_entry_if_enabled(data_t *data) |