lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2010-12-04 18:17:15 +00:00
parent 4add75c43f
commit 340479aac6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/i915/i915_drv.c
View File

@@ -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);