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

Commit 5f35308b authored by Chris Wilson's avatar Chris Wilson Committed by Eric Anholt
Browse files

drm/i915: Propagate error from drm_install_irq() during EnterVT 



Simple fix for error propagation along the old UMS path.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 7aa69d2e

drivers/gpu/drm/i915/i915_gem.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -4687,9 +4687,19 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, 
	BUG_ON(HAS_BSD(dev) && !list_empty(&dev_priv->bsd_ring.request_list));

	BUG_ON(HAS_BSD(dev) && !list_empty(&dev_priv->bsd_ring.request_list));

	mutex_unlock(&dev->struct_mutex);

	mutex_unlock(&dev->struct_mutex);





	drm_irq_install(dev);

	ret = drm_irq_install(dev);

	if (ret)

		goto cleanup_ringbuffer;





	return 0;

	return 0;



cleanup_ringbuffer:

	mutex_lock(&dev->struct_mutex);

	i915_gem_cleanup_ringbuffer(dev);

	dev_priv->mm.suspended = 1;

	mutex_unlock(&dev->struct_mutex);



	return ret;

}

}





int

int