[igt-dev] [PATCH i-g-t 1/3] tests/kms_fbcon_fbt: Check for psr before keeling over

Daniel Vetter daniel.vetter at ffwll.ch
Tue Jan 28 11:25:47 UTC 2020


Not exactly sure where this broke, or whether it ever worked, but the
psr_disable helper calls igt_skip if psr doesn't work. Which means we
neeed to check for that first.

In general lib/igt_psr.c seems to be a library in dire need of some TLC.

Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
 tests/kms_fbcon_fbt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/kms_fbcon_fbt.c b/tests/kms_fbcon_fbt.c
index acbb6d303f62..506848cfcf47 100644
--- a/tests/kms_fbcon_fbt.c
+++ b/tests/kms_fbcon_fbt.c
@@ -222,7 +222,8 @@ static bool psr_wait_until_update(int debugfs_fd)
 static void disable_features(int debugfs_fd)
 {
 	igt_set_module_param_int("enable_fbc", 0);
-	psr_disable(debugfs_fd);
+	if (psr_sink_support(debugfs_fd, PSR_MODE_1))
+		psr_disable(debugfs_fd);
 }
 
 static inline void fbc_modparam_enable(int debugfs_fd)
-- 
2.24.1



More information about the igt-dev mailing list