summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-07-12 15:42:45 +1000
committerBen Skeggs <bskeggs@redhat.com>2011-07-25 09:42:09 +1000
commit9717f3d953f294bf416258f6b1f2d9512babd337 (patch)
tree6914328ea285b1c63e56bef70baf1fb684e7d863 /drivers/gpu
parente19b20bbd291f13581975bd0bdc1d92ce2385cc4 (diff)
downloadblackbird-obmc-linux-9717f3d953f294bf416258f6b1f2d9512babd337.tar.gz
blackbird-obmc-linux-9717f3d953f294bf416258f6b1f2d9512babd337.zip
drm/nouveau: detect disabled device in irq handler and return IRQ_NONE
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index 2ba7265bc967..868c7fd74854 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);
OpenPOWER on IntegriCloud