diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-08 12:22:13 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-08 12:23:55 +0000 |
commit | 28a2f14956f7672e303fed1f9ec85cade7bd7a56 (patch) | |
tree | 32f7178ec125f16ac4f96f8d942f77088749c0c3 | |
parent | 5e8fb77026d2a0d172b39a7bede0ce735f99d8f2 (diff) |
igt/gem_eio: Check we succeed in unwedging the driver
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r-- | lib/igt_gt.c | 12 | ||||
-rw-r--r-- | tests/gem_eio.c | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/igt_gt.c b/lib/igt_gt.c index 3c01fe3b..024908b8 100644 --- a/lib/igt_gt.c +++ b/lib/igt_gt.c @@ -362,7 +362,8 @@ void igt_post_hang_ring(int fd, igt_hang_t arg) */ void igt_force_gpu_reset(void) { - int fd, ret; + FILE *file; + int fd, ret, wedged; igt_debug("Triggering GPU reset\n"); @@ -373,6 +374,15 @@ void igt_force_gpu_reset(void) close(fd); igt_assert_eq(ret, 3); + + file = igt_debugfs_fopen("i915_wedged", "r"); + igt_assert(file); + + wedged = 1; + fscanf(file, "%d", &wedged); + fclose(file); + + igt_assert(!wedged); } /* GPU abusers */ diff --git a/tests/gem_eio.c b/tests/gem_eio.c index 22fcf439..d9e68657 100644 --- a/tests/gem_eio.c +++ b/tests/gem_eio.c @@ -228,6 +228,7 @@ igt_main igt_fixture { fd = drm_open_driver(DRIVER_INTEL); + igt_require_gem(fd); igt_require_hang_ring(fd, I915_EXEC_DEFAULT); } |