diff options
| author | Dave Airlie <airlied@gmail.com> | 2012-09-27 11:58:53 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-09-27 11:58:53 +0400 |
| commit | d638163099c86f65984d85aab7ddf2cf78fa3a16 (patch) | |
| tree | 9c9feb730be2464aa4c54f23a8f13192ebe49e60 | |
| parent | 3a75885848996baab5276ff37ebf7295c3c753f0 (diff) | |
| parent | 833dd8224edda0bc1cfa1b0fd5cbe7a36fd59db8 (diff) | |
| download | linux-d638163099c86f65984d85aab7ddf2cf78fa3a16.tar.xz | |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Another spurious dmesg quitening.
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nvc0/fifo: ignore bits in PFIFO_INTR that aren't set in PFIFO_INTR_EN
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvc0_fifo.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nve0_fifo.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_fifo.c b/drivers/gpu/drm/nouveau/nvc0_fifo.c index 7d85553d518c..cd39eb99f5b1 100644 --- a/drivers/gpu/drm/nouveau/nvc0_fifo.c +++ b/drivers/gpu/drm/nouveau/nvc0_fifo.c @@ -373,7 +373,8 @@ nvc0_fifo_isr_subfifo_intr(struct drm_device *dev, int unit) static void nvc0_fifo_isr(struct drm_device *dev) { - u32 stat = nv_rd32(dev, 0x002100); + u32 mask = nv_rd32(dev, 0x002140); + u32 stat = nv_rd32(dev, 0x002100) & mask; if (stat & 0x00000100) { NV_INFO(dev, "PFIFO: unknown status 0x00000100\n"); diff --git a/drivers/gpu/drm/nouveau/nve0_fifo.c b/drivers/gpu/drm/nouveau/nve0_fifo.c index e98d144e6eb9..281bece751b6 100644 --- a/drivers/gpu/drm/nouveau/nve0_fifo.c +++ b/drivers/gpu/drm/nouveau/nve0_fifo.c @@ -345,7 +345,8 @@ nve0_fifo_isr_subfifo_intr(struct drm_device *dev, int unit) static void nve0_fifo_isr(struct drm_device *dev) { - u32 stat = nv_rd32(dev, 0x002100); + u32 mask = nv_rd32(dev, 0x002140); + u32 stat = nv_rd32(dev, 0x002100) & mask; if (stat & 0x00000100) { NV_INFO(dev, "PFIFO: unknown status 0x00000100\n"); |