hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dave Airlie 2012-09-27 17:58:53 +10:00
parent 3a75885848 833dd8224e
commit d638163099
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/nvc0_fifo.c
View File

@ -373,7 +373,8 @@ nvc0_fifo_isr_subfifo_intr(struct drm_device *dev, int unit)
static void static void
nvc0_fifo_isr(struct drm_device *dev) 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) { if (stat & 0x00000100) {
NV_INFO(dev, "PFIFO: unknown status 0x00000100\n"); NV_INFO(dev, "PFIFO: unknown status 0x00000100\n");

3
drivers/gpu/drm/nouveau/nve0_fifo.c
View File

@ -345,7 +345,8 @@ nve0_fifo_isr_subfifo_intr(struct drm_device *dev, int unit)
static void static void
nve0_fifo_isr(struct drm_device *dev) 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) { if (stat & 0x00000100) {
NV_INFO(dev, "PFIFO: unknown status 0x00000100\n"); NV_INFO(dev, "PFIFO: unknown status 0x00000100\n");