Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6381630 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-nouveau-fixes' of... 

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
parents 3a758858 833dd822

drivers/gpu/drm/nouveau/nvc0_fifo.c

+2 −1
Original line number Diff line number Diff line
@@ -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");

drivers/gpu/drm/nouveau/nve0_fifo.c

+2 −1
Original line number Diff line number Diff line
@@ -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");