summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-01-31 15:17:17 +0100
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-02-01 10:54:44 +0100
commitc8eb378cd55bfa6b9e059a5231e81b701befe81d (patch)
treef48288233d8cc8dc0f2db950bcc6e6bd0d678525
parent5bf30a96a5a21c230a141e491afcafb4ffe741c9 (diff)
tests/kms_frontbuffer_tracking: Fix skips when PSR is not available.
Use psr.can_test to determine we can disable PSR, and not skip because PSR is unavailable. Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> Cc: José Roberto de Souza <jose.souza@intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
-rw-r--r--lib/igt_psr.c2
-rw-r--r--tests/kms_frontbuffer_tracking.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index 5eb6d2c6..6ad2c522 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -106,7 +106,7 @@ static bool psr_set(int debugfs_fd, int mode)
ret = has_psr_debugfs(debugfs_fd);
if (ret == -ENODEV) {
- igt_skip_on_f(mode >= PSR_MODE_1, "PSR not available\n");
+ igt_skip("PSR not available\n");
return false;
}
diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
index 609f7b41..4d15ce1c 100644
--- a/tests/kms_frontbuffer_tracking.c
+++ b/tests/kms_frontbuffer_tracking.c
@@ -1134,7 +1134,7 @@ static bool disable_features(const struct test_mode *t)
fbc_disable();
drrs_disable();
- return psr_disable(drm.debugfs);
+ return psr.can_test ? psr_disable(drm.debugfs) : false;
}
static void *busy_thread_func(void *data)