Commit 340479aa authored Dec 04, 2010 by Chris Wilson

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: Chris Wilson <chris@chris-wilson.co.uk>

parent 4add75c4

drivers/gpu/drm/i915/i915_drv.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -440,7 +440,8 @@ int i915_reset(struct drm_device *dev, u8 flags)
		bool need_display = true;
		int ret;

		mutex_lock(&dev->struct_mutex);
		if (!mutex_trylock(&dev->struct_mutex))
		return -EBUSY;

		i915_gem_reset(dev);