diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-06-07 14:03:03 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-08-01 19:03:44 -0700 |
| commit | 5f35308bab7efd8c03e4bb4feea07f9b94138c3c (patch) | |
| tree | bf324e79001e558169f88c50617858556dbc61f2 | |
| parent | 7aa69d2ee7e1ecff104fc068585f21af45582982 (diff) | |
| download | kernel_samsung_aries-5f35308bab7efd8c03e4bb4feea07f9b94138c3c.zip kernel_samsung_aries-5f35308bab7efd8c03e4bb4feea07f9b94138c3c.tar.gz kernel_samsung_aries-5f35308bab7efd8c03e4bb4feea07f9b94138c3c.tar.bz2 | |
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>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 12 |
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 8004dc9..0bf4bcd 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 |