summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-06-12 10:56:37 -0700
committerEric Anholt <eric@anholt.net>2008-06-12 10:56:37 -0700
commitcc74ac359053e95fd79d7011a2e18defcefb5c19 (patch)
tree075eaadd9e91c6ab5d3c7369dad5317155845b62
parentb2606e325ac02782297def5ce27028c7fe2287c8 (diff)
Don't clear USER_INTERRUPT if we're not handling it.
This fixes a regression from commit d434b64f6a760d85295e32298a9a1f3624ee1b69 which could cause us to fail to wake up for user interrupts if we lost a race.
-rw-r--r--shared-core/i915_irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 0125f8b3..39da8143 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -507,7 +507,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
if (dev_priv->sarea_priv)
dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
- I915_WRITE(I915REG_INT_IDENTITY_R, iir | I915_USER_INTERRUPT);
+ I915_WRITE(I915REG_INT_IDENTITY_R, iir);
(void) I915_READ(I915REG_INT_IDENTITY_R); /* Flush posted write */
if (iir & I915_USER_INTERRUPT) {