diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-06-28 12:49:35 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-06-28 13:02:03 +0200 |
| commit | 9120ee572f86ed6f3da088187043785d1da340c9 (patch) | |
| tree | a46485a9e86fbece912cf3544195b67c80bf1dcf /tests/kms_busy.c | |
| parent | 9cb998fcaacb25d0d5cca377c498d4063f707501 (diff) | |
tests/kms_busy: Remove gem_bo_busy checks
They're not useful since GPU reset may kill off our spin batch.
This used to be the case but wasn't in the kernel when I wrote this
test. But the following commit reintroduced this behavior:
commit 36703e79a982c8ce5a8e43833291f2719e92d0d1
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Jun 22 11:56:25 2017 +0100
drm/i915: Break modeset deadlocks on reset
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'tests/kms_busy.c')
| -rw-r--r-- | tests/kms_busy.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tests/kms_busy.c b/tests/kms_busy.c index af7ed992..af7335db 100644 --- a/tests/kms_busy.c +++ b/tests/kms_busy.c @@ -201,8 +201,7 @@ static void test_flip(igt_display_t *dpy, unsigned ring, int pipe, bool modeset) } static void test_atomic_commit_hang(igt_display_t *dpy, igt_plane_t *primary, - struct igt_fb *busy_fb, unsigned ring, - bool completes_early) + struct igt_fb *busy_fb, unsigned ring) { igt_spin_t *t = igt_spin_batch_new(dpy->drm_fd, ring, busy_fb->gem_handle); struct pollfd pfd = { .fd = dpy->drm_fd, .events = POLLIN }; @@ -223,11 +222,6 @@ static void test_atomic_commit_hang(igt_display_t *dpy, igt_plane_t *primary, igt_plane_set_fb(primary, NULL); igt_display_commit_atomic(dpy, 0, NULL); - if (completes_early) - igt_assert(gem_bo_busy(dpy->drm_fd, busy_fb->gem_handle)); - else - igt_fail_on(gem_bo_busy(dpy->drm_fd, busy_fb->gem_handle)); - igt_assert_f(poll(&pfd, 1, 1) > 0, "nonblocking update completed whilst fb[%d] was still busy [%d]\n", busy_fb->fb_id, gem_bo_busy(dpy->drm_fd, busy_fb->gem_handle)); @@ -261,12 +255,12 @@ static void test_hang(igt_display_t *dpy, unsigned ring, /* Test modeset disable with hang */ igt_output_set_pipe(output, PIPE_NONE); igt_plane_set_fb(primary, &fb[1]); - test_atomic_commit_hang(dpy, primary, &fb[hang_newfb], ring, hang_newfb); + test_atomic_commit_hang(dpy, primary, &fb[hang_newfb], ring); /* Test modeset enable with hang */ igt_plane_set_fb(primary, &fb[0]); igt_output_set_pipe(output, pipe); - test_atomic_commit_hang(dpy, primary, &fb[!hang_newfb], ring, hang_newfb); + test_atomic_commit_hang(dpy, primary, &fb[!hang_newfb], ring); } else { /* * Test what happens with a single hanging pageflip. @@ -274,7 +268,7 @@ static void test_hang(igt_display_t *dpy, unsigned ring, * timeouts taking care of it. */ igt_plane_set_fb(primary, &fb[1]); - test_atomic_commit_hang(dpy, primary, &fb[hang_newfb], ring, true); + test_atomic_commit_hang(dpy, primary, &fb[hang_newfb], ring); } do_cleanup_display(dpy); |