Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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 <chris@chris-wilson.co.uk>
parent 4add75c4
Loading
Loading
Loading
Loading
+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);