1 files changed, 27 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 3971b5e6ad60..69cdbcd6e5b7 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -687,12 +687,37 @@ gen6_ring_put_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag)
 static bool
 bsd_ring_get_irq(struct intel_ring_buffer *ring)
 {
-        return ring_get_irq(ring, GT_BSD_USER_INTERRUPT);
+        struct drm_device *dev = ring->dev;
+        drm_i915_private_t *dev_priv = dev->dev_private;
+
+        if (!dev->irq_enabled)
+                return false;
+
+        spin_lock(&ring->irq_lock);
+        if (ring->irq_refcount++ == 0) {
+                if (IS_G4X(dev))
+                        i915_enable_irq(dev_priv, I915_BSD_USER_INTERRUPT);
+                else
+                        ironlake_enable_irq(dev_priv, GT_BSD_USER_INTERRUPT);
+        }
+        spin_unlock(&ring->irq_lock);
+
+        return true;
 }
 static void
 bsd_ring_put_irq(struct intel_ring_buffer *ring)
 {
-        ring_put_irq(ring, GT_BSD_USER_INTERRUPT);
+        struct drm_device *dev = ring->dev;
+        drm_i915_private_t *dev_priv = dev->dev_private;
+
+        spin_lock(&ring->irq_lock);
+        if (--ring->irq_refcount == 0) {
+                if (IS_G4X(dev))
+                        i915_disable_irq(dev_priv, I915_BSD_USER_INTERRUPT);
+                else
+                        ironlake_disable_irq(dev_priv, GT_BSD_USER_INTERRUPT);
+        }
+        spin_unlock(&ring->irq_lock);
 }
 
 static int