Commit 340479aa authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Be paranoid and bail on resetting if we can't take the lock.

This will declare the machine wedged, but is better than truly wedging
the machine.

Signed-off-by: default avatarChris Wilson <>
parent 4add75c4
...@@ -440,7 +440,8 @@ int i915_reset(struct drm_device *dev, u8 flags) ...@@ -440,7 +440,8 @@ int i915_reset(struct drm_device *dev, u8 flags)
bool need_display = true; bool need_display = true;
int ret; int ret;
mutex_lock(&dev->struct_mutex); if (!mutex_trylock(&dev->struct_mutex))
return -EBUSY;
i915_gem_reset(dev); i915_gem_reset(dev);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment