summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>2012-04-19 17:59:20 (GMT)
committerBen Skeggs <bskeggs@redhat.com>2012-04-30 05:55:46 (GMT)
commitffc6a4e49e5bc117aac13ed752cfc018c163e2ac (patch)
tree5131b78fac36cfcd2aa2d7246484cee58066334f /drivers/gpu
parent0ed4bb92f5514bd1118c5dd537ce424381110286 (diff)
downloadlinux-ffc6a4e49e5bc117aac13ed752cfc018c163e2ac.tar.xz
nvc0/fb: shut up PMFB interrupt after the first occurrence
Signed-off-by: Christoph Bumiller <e0425955@student.tuwien.ac.at> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nvc0_fb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_fb.c b/drivers/gpu/drm/nouveau/nvc0_fb.c
index 5bf5503..f704e94 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fb.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fb.c
@@ -54,6 +54,11 @@ nvc0_mfb_isr(struct drm_device *dev)
nvc0_mfb_subp_isr(dev, unit, subp);
units &= ~(1 << unit);
}
+
+ /* we do something horribly wrong and upset PMFB a lot, so mask off
+ * interrupts from it after the first one until it's fixed
+ */
+ nv_mask(dev, 0x000640, 0x02000000, 0x00000000);
}
static void