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

Simple fix for error propagation along the old UMS path.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>

1 files changed, 11 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 8004dc95c3a8..0bf4bcd53e97 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -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));
         mutex_unlock(&dev->struct_mutex);
 
-        drm_irq_install(dev);
+        ret = drm_irq_install(dev);
+        if (ret)
+                goto cleanup_ringbuffer;
 
         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