summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2018-07-06 07:53:10 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2018-07-06 11:24:42 +0100
commita9450e15ad9e921fd2d76b038a8b252b1afc7bb6 (patch)
tree6dc70d6c2d38d0a63594af5b400bdf0894b633d9
parente16f4c36cb9bf61fcd70a2ea978cee2a23ebf71d (diff)
downloadlinux-a9450e15ad9e921fd2d76b038a8b252b1afc7bb6.tar.bz2
drm/i915/selftests: Skip all request selftests when wedged
If the GPU is irrecoverably wedge, we cannot submit any request and so all of the request selftests will expectedly fail. Skip over them. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Matthew Auld <matthew.auld@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180706065332.15214-5-chris@chris-wilson.co.uk
-rw-r--r--drivers/gpu/drm/i915/selftests/i915_request.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index e44aa3335d9e..cc27edc40356 100644
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -859,5 +859,9 @@ int i915_request_live_selftests(struct drm_i915_private *i915)
SUBTEST(live_sequential_engines),
SUBTEST(live_empty_request),
};
+
+ if (i915_terminally_wedged(&i915->gpu_error))
+ return 0;
+
return i915_subtests(tests, i915);
}