diff options
| author | Chris Wilson | 2018-07-06 08:53:11 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-07-06 12:24:54 +0200 |
| commit | 47e61a79806d5d222261250dc573a68c53e99c22 (patch) | |
| tree | b1e38c605115b5214faa50e4244dc722b65aad56 /drivers/gpu/drm/i915/selftests | |
| parent | drm/i915/selftests: Skip all request selftests when wedged (diff) | |
| download | kernel-qcow2-linux-47e61a79806d5d222261250dc573a68c53e99c22.tar.gz kernel-qcow2-linux-47e61a79806d5d222261250dc573a68c53e99c22.tar.xz kernel-qcow2-linux-47e61a79806d5d222261250dc573a68c53e99c22.zip | |
drm/i915/selftests: Skip workaround tests when wedged
If the GPU is irrecoverably wedged, we cannot submit any request and
therefore cannot query the register state of the context (which is done
using the GPU command stream). So skip over the test as it expectedly
fails.
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-6-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/selftests')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/intel_workarounds.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/selftests/intel_workarounds.c b/drivers/gpu/drm/i915/selftests/intel_workarounds.c index e1ea2d2bedd2..3d86b90ab722 100644 --- a/drivers/gpu/drm/i915/selftests/intel_workarounds.c +++ b/drivers/gpu/drm/i915/selftests/intel_workarounds.c @@ -283,6 +283,9 @@ int intel_workarounds_live_selftests(struct drm_i915_private *i915) }; int err; + if (i915_terminally_wedged(&i915->gpu_error)) + return 0; + mutex_lock(&i915->drm.struct_mutex); err = i915_subtests(tests, i915); mutex_unlock(&i915->drm.struct_mutex); |