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

Commit d816f6ac authored by Wu Fengguang's avatar Wu Fengguang Committed by Eric Anholt
Browse files

drm/i915: fix unpaired i915 device mutex on entervt failure. 



Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 72021788

drivers/gpu/drm/i915/i915_gem.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -4087,8 +4087,10 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, 
	dev_priv->mm.suspended = 0;

	dev_priv->mm.suspended = 0;





	ret = i915_gem_init_ringbuffer(dev);

	ret = i915_gem_init_ringbuffer(dev);

	if (ret != 0)

	if (ret != 0) {

		mutex_unlock(&dev->struct_mutex);

		return ret;

		return ret;

	}





	spin_lock(&dev_priv->mm.active_list_lock);

	spin_lock(&dev_priv->mm.active_list_lock);

	BUG_ON(!list_empty(&dev_priv->mm.active_list));

	BUG_ON(!list_empty(&dev_priv->mm.active_list));