Attachment 134329 Details for Bug 102259 – Fix GPU hang?

[patch] Fix GPU hang?

file_102259.txt (text/plain), 2.30 KB, created by Maarten Lankhorst on 2017-09-19 08:00:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maarten Lankhorst

Created: 2017-09-19 08:00:28 UTC

Size: 2.30 KB

patch

obsolete

>diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
>index 2d32d3a91570..1268f6dc1ed3 100644
>--- a/tests/kms_cursor_legacy.c
>+++ b/tests/kms_cursor_legacy.c
>@@ -1348,7 +1348,7 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
> 
> 	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
> 
>-	pipe_crc = igt_pipe_crc_new(display->drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
>+	pipe_crc = igt_pipe_crc_new_nonblock(display->drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
> 
> 	set_cursor_on_pipe(display, pipe, &cursor_fb);
> 	igt_display_commit2(display, COMMIT_UNIVERSAL);
>@@ -1371,9 +1371,17 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
> 	igt_plane_set_fb(plane_primary, &fb_info[0]);
> 	igt_display_commit2(display, COMMIT_UNIVERSAL);
> 
>+	/*
>+	 * We must enable CRC collecting here since this may force
>+	 * a modeset, and this loop is timing sensitive.
>+	 */
>+	igt_pipe_crc_start(pipe_crc);
>+
> 	/* Disable cursor, and immediately queue a flip. Check if resulting crc is correct. */
> 	for (int i = 1; i >= 0; i--) {
> 		uint32_t *busy;
>+		igt_crc_t *received_crcs = NULL;
>+		int ncrcs;
> 
> 		busy = make_fb_busy(display->drm_fd, &fb_info[1]);
> 
>@@ -1384,7 +1392,7 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
> 
> 		igt_assert_eq(get_vblank(display->drm_fd, pipe, 0), vblank_start);
> 
>-		igt_pipe_crc_collect_crc(pipe_crc, &crcs[2]);
>+		ncrcs = igt_pipe_crc_get_crcs(pipe_crc, 8, &received_crcs);
> 
> 		finish_fb_busy(busy);
> 
>@@ -1397,13 +1405,22 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
> 		igt_plane_set_fb(plane_primary, &fb_info[0]);
> 		igt_display_commit2(display, COMMIT_UNIVERSAL);
> 
>-		igt_assert_crc_equal(&crcs[i], &crcs[2]);
>+		igt_assert(ncrcs > 0);
>+
>+		igt_assert_crc_equal(&crcs[i], &received_crcs[ncrcs - 1]);
>+		free(received_crcs);
> 	}
> 
> 	do_cleanup_display(display);
> 	igt_remove_fb(display->drm_fd, &fb_info[1]);
> 	igt_remove_fb(display->drm_fd, &fb_info[0]);
> 	igt_remove_fb(display->drm_fd, &cursor_fb);
>+
>+	/*
>+	 * igt_pipe_crc_stop() may force a modeset for workarounds, call
>+	 * it after do_cleanup_display since we disable the display anyway.
>+	 */
>+	igt_pipe_crc_stop(pipe_crc);
> 	igt_pipe_crc_free(pipe_crc);
> }
>

Actions: View | Splinter Review

Attachments on bug 102259: 134222 | 134223 | 134329

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.