From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 12 Jul 2011 05:42:45 +0000 (+1000)
Subject: drm/nouveau: detect disabled device in irq handler and return IRQ_NONE
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=9717f3d953f294bf416258f6b1f2d9512babd337;p=linux-edison.git

drm/nouveau: detect disabled device in irq handler and return IRQ_NONE

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index 2ba7265bc96..868c7fd7485 100644
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -79,7 +79,7 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
 	int i;
 
 	stat = nv_rd32(dev, NV03_PMC_INTR_0);
-	if (!stat)
+	if (stat == 0 || stat == ~0)
 		return IRQ_NONE;
 
 	spin_lock_irqsave(&dev_priv->context_switch_lock, flags);