From 45f0ba252194c24175b38181eb8cc3c2a6c20587 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Fri, 17 Aug 2018 10:46:31 +0200 Subject: tests/kms_frontbuffer_tracking: Don't unset mode after reading CRC Until the previous commit we had to disable the mode after reading CRC because otherwise we might not have been enable features correctly. Now we can just stage the disable without applying it, so each subtest can set its desired mode and igt_display will update the state as required. Behavior with legacy PSR: - Modeset enable, read CRC, enable legacy PSR switch, disable CRTC if using legacy PSR by calling igt_display_commit. Next enable CRTC will enable PSR. Behavior with debugfs PSR: - Modeset enable - Read CRC - Enable debugfs PSR switch. PSR enabled. - Next commit will be done by test, which can disable the mode or set a mode. The latter case will be a compatible mode, in which case we avoid the modeset. Signed-off-by: Maarten Lankhorst Reviewed-by: Dhinakaran Pandiyan --- tests/kms_frontbuffer_tracking.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/kms_frontbuffer_tracking.c') diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index a570f93a..921aaffc 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -1220,7 +1220,7 @@ static void init_blue_crc(enum pixel_format format) print_crc("Blue CRC: ", &blue_crcs[format].crc); - unset_all_crtcs(); + igt_display_reset(&drm.display); igt_remove_fb(drm.fd, &blue); @@ -1272,7 +1272,7 @@ static void init_crcs(enum pixel_format format, print_crc("", &pattern->crcs[format][r]); } - unset_all_crtcs(); + igt_display_reset(&drm.display); for (r = 0; r < pattern->n_rects; r++) igt_remove_fb(drm.fd, &tmp_fbs[r]); -- cgit v1.2.3