From 27f61d0c9364bbf8bc88a4ffceb78b645aff6680 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 23 Jun 2008 11:20:17 -0700 Subject: [intel] leave interrupts disabled in ISR only on MSI again While debugging the 915, I tried this trick there and accidentally left it set. --- shared-core/i915_irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index 6f1d91b3..23edddb1 100644 --- 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); -- cgit v1.2.3