From a663424e2a5ebf3c8e9ab743143e0856f978f7d6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 7 Jun 2017 11:32:50 +0100 Subject: Revert "kms_cursor_legacy: Add a burner thread to make basic-busy-* pass." This reverts commit 7c8703fb02b248c2bcf9756bba8812bcfe7ed5d3. If we expect it to fail until we find a solution, let the hw fail and continue to track the known failure in CI/bugs. Cc: Martin Peres Acked-by: Martin Peres --- tests/kms_cursor_legacy.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'tests/kms_cursor_legacy.c') diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c index 2eb1d1bd..ac05ca53 100644 --- a/tests/kms_cursor_legacy.c +++ b/tests/kms_cursor_legacy.c @@ -618,23 +618,9 @@ static void basic_flip_cursor(igt_display_t *display, do_ioctl(display->drm_fd, DRM_IOCTL_MODE_CURSOR, &arg[0]); busy = NULL; - if (flags & BASIC_BUSY) { + if (flags & BASIC_BUSY) busy = make_fb_busy(display->drm_fd, &fb_info); - /* - * Prevent going into C3 or higher state - * or we may miss vblank interrupts on SNB. - */ - igt_fork(child, 1) { - struct sched_param parm = { .sched_priority = 0 }; - - igt_assert(sched_setscheduler(0, SCHED_IDLE, &parm) == 0); - - while (*busy != MI_BATCH_BUFFER_END) - sched_yield(); - } - } - /* Start with a synchronous query to align with the vblank */ vblank_start = get_vblank(display->drm_fd, pipe, DRM_VBLANK_NEXTONMISS); @@ -699,8 +685,6 @@ static void basic_flip_cursor(igt_display_t *display, delta = get_vblank(display->drm_fd, pipe, 0) - vblank_start; - igt_waitchildren(); - if (!mode_requires_extra_vblank(mode)) miss2 += delta != 1; else -- cgit v1.2.3