public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH 1/2][V2] tests/kms_universal_plane: turn off pipe when primary plane is off
@ 2022-10-17  0:49 Alex Hung
  2022-10-17  0:49 ` [igt-dev] [PATCH 2/2][V2] tests/kms_universal_plane: skip when pipe and primary plane cannot be off Alex Hung
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Alex Hung @ 2022-10-17  0:49 UTC (permalink / raw)
  To: igt-dev; +Cc: markyacoub

GPU drivers can reject when crtc is on and primary plane is off,
so turn crtc off with primary plane and turn it on afterwards.

Signed-off-by: Alex Hung <alex.hung@amd.com>
---
 tests/kms_universal_plane.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index 64416afd..2db1d7e8 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -228,11 +228,14 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 	igt_pipe_crc_collect_crc(test.pipe_crc, &test.crc_7);
 
 	/* Step 11: Disable primary plane */
+	igt_output_set_pipe(output, PIPE_NONE);
+	igt_display_commit2(display, COMMIT_ATOMIC);
 	igt_plane_set_fb(primary, NULL);
 	igt_display_commit2(display, COMMIT_UNIVERSAL);
 
 	/* Step 12: Legacy modeset to yellow FB (CRC 8) */
 	igt_plane_set_fb(primary, &test.yellow_fb);
+	igt_output_set_pipe(output, pipe);
 	igt_display_commit2(display, COMMIT_LEGACY);
 	igt_pipe_crc_collect_crc(test.pipe_crc, &test.crc_8);
 
@@ -497,6 +500,8 @@ pageflip_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 	igt_display_commit2(&data->display, COMMIT_LEGACY);
 
 	/* Disable the primary plane */
+	igt_output_set_pipe(output, PIPE_NONE);
+	igt_display_commit2(&data->display, COMMIT_ATOMIC);
 	igt_plane_set_fb(primary, NULL);
 	igt_display_commit2(&data->display, COMMIT_UNIVERSAL);
 
@@ -506,6 +511,7 @@ pageflip_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 	 * Note that crtc->primary->fb = NULL causes flip to return EBUSY for
 	 * historical reasons...
 	 */
+	igt_output_set_pipe(output, pipe);
 	igt_assert(drmModePageFlip(data->drm_fd, output->config.crtc->crtc_id,
 				   test.red_fb.fb_id, 0, NULL) == -EBUSY);
 
@@ -520,9 +526,13 @@ pageflip_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 	 * completes, which we don't have a good way to specifically test for,
 	 * but at least we can make sure that nothing blows up.
 	 */
+	igt_output_set_pipe(output, pipe);
+	igt_display_commit2(&data->display, COMMIT_ATOMIC);
 	igt_assert(drmModePageFlip(data->drm_fd, output->config.crtc->crtc_id,
 				   test.red_fb.fb_id, DRM_MODE_PAGE_FLIP_EVENT,
 				   &test) == 0);
+	igt_output_set_pipe(output, PIPE_NONE);
+	igt_display_commit2(&data->display, COMMIT_ATOMIC);
 	igt_plane_set_fb(primary, NULL);
 	igt_display_commit2(&data->display, COMMIT_UNIVERSAL);
 
-- 
2.38.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-11 10:36 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-17  0:49 [igt-dev] [PATCH 1/2][V2] tests/kms_universal_plane: turn off pipe when primary plane is off Alex Hung
2022-10-17  0:49 ` [igt-dev] [PATCH 2/2][V2] tests/kms_universal_plane: skip when pipe and primary plane cannot be off Alex Hung
2022-10-17  1:24 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [1/2,V2] tests/kms_universal_plane: turn off pipe when primary plane is off Patchwork
2022-10-17  2:36 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2022-10-17 14:14 ` [igt-dev] [PATCH 1/2][V2] " Mark Yacoub
2022-11-11 10:36 ` Ville Syrjälä

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox