From: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri, 22 Jun 2007 09:55:26 +0000 (+0200)
Subject: radeon: Acknowledge all interrupts we're interested in.
X-Git-Tag: libdrm-2.3.1~183^2~264
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=068ffc1e1bf5607f836839a1fc621a95547251e3;p=platform%2Fupstream%2Flibdrm.git

radeon: Acknowledge all interrupts we're interested in.

Failure to do so was probably the root cause of fd.o bug 11287.
---

diff --git a/shared-core/radeon_irq.c b/shared-core/radeon_irq.c
index 5151b4d..a4be86e 100644
--- a/shared-core/radeon_irq.c
+++ b/shared-core/radeon_irq.c
@@ -72,10 +72,14 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)
 	/* Only consider the bits we're interested in - others could be used
 	 * outside the DRM
 	 */
-	stat = radeon_acknowledge_irqs(dev_priv, dev_priv->irq_enable_reg);
+	stat = radeon_acknowledge_irqs(dev_priv, (RADEON_SW_INT_TEST_ACK |
+						  RADEON_CRTC_VBLANK_STAT |
+						  RADEON_CRTC2_VBLANK_STAT));
 	if (!stat)
 		return IRQ_NONE;
 
+	stat &= dev_priv->irq_enable_reg;
+
 	/* SW interrupt */
 	if (stat & RADEON_SW_INT_TEST) {
 		DRM_WAKEUP(&dev_priv->swi_queue);
@@ -265,7 +269,8 @@ void radeon_driver_irq_preinstall(drm_device_t * dev)
 
 	/* Clear bits if they're already high */
 	radeon_acknowledge_irqs(dev_priv, (RADEON_SW_INT_TEST_ACK |
-					   RADEON_CRTC_VBLANK_STAT));
+					   RADEON_CRTC_VBLANK_STAT |
+					   RADEON_CRTC2_VBLANK_STAT));
 }
 
 void radeon_driver_irq_postinstall(drm_device_t * dev)