[intel] leave interrupts disabled in ISR only on MSI again

While debugging the 915, I tried this trick there and accidentally left it
set.

diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 6f1d91b384b3148c2fc83e5142214f2f41bcc771..23edddb1bdf0a8647639cb837ed0ae4ea7b1ad1e 100644 (file)
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -508,7 +508,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
        int vblank = 0;
 
        DRM_SPINLOCK(&dev_priv->user_irq_lock);
-//     if (dev->pdev->msi_enabled)
+       if (dev->pdev->msi_enabled)
                i915_disable_irqs(dev_priv);
        iir = I915_READ(I915REG_INT_IDENTITY_R);
 #if 0
@@ -522,7 +522,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                           I915_READ(I915REG_INT_ENABLE_R),
                           I915_READ(I915REG_PIPEASTAT),
                           I915_READ(I915REG_PIPEBSTAT));
-//             if (dev->pdev->msi_enabled)
+               if (dev->pdev->msi_enabled)
                        i915_enable_irqs(dev_priv);
 
                DRM_SPINUNLOCK(&dev_priv->user_irq_lock);
@@ -545,7 +545,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
        I915_WRITE(I915REG_INT_IDENTITY_R, iir);
        (void) I915_READ(I915REG_INT_IDENTITY_R); /* Flush posted writes */
 
-//     if (dev->pdev->msi_enabled)
+       if (dev->pdev->msi_enabled)
                i915_enable_irqs(dev_priv);
 
        DRM_SPINUNLOCK(&dev_priv->user_irq_lock);