OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
drm/i915/selftests: Skip workaround tests when wedged
[android-x86/kernel.git]
/
drivers
/
gpu
/
drm
/
i915
/
selftests
/
intel_workarounds.c
diff --git
a/drivers/gpu/drm/i915/selftests/intel_workarounds.c
b/drivers/gpu/drm/i915/selftests/intel_workarounds.c
index
e1ea2d2
..
3d86b90
100644
(file)
--- 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);