From: Ben Skeggs <bskeggs@redhat.com>
Date: Sun, 23 Feb 2014 13:06:22 +0000 (+1000)
Subject: drm/nve0/fifo: mask unhandled intr bits when seen, rather than all intrs
X-Git-Tag: v3.15-rc1~51^2~39^2~56
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7a42f492a3135a2b70a28595e417a2d390a0e920;p=karo-tx-linux.git

drm/nve0/fifo: mask unhandled intr bits when seen, rather than all intrs

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
index dbc3ff632e3e..6853cd2fa6fd 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
@@ -743,9 +743,9 @@ nve0_fifo_intr(struct nouveau_subdev *subdev)
 	}
 
 	if (stat) {
-		nv_fatal(priv, "unhandled status 0x%08x\n", stat);
+		nv_error(priv, "INTR 0x%08x\n", stat);
+		nv_mask(priv, 0x002140, stat, 0x00000000);
 		nv_wr32(priv, 0x002100, stat);
-		nv_wr32(priv, 0x002140, 0);
 	}
 }