From: Lauri Peltonen <lpeltonen@nvidia.com>
Date: Thu, 26 Feb 2015 04:16:48 +0000 (+0900)
Subject: drm/nouveau/gr/gf100: Clear notify interrupt
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c6a7b026a3a80662d8f7bb6b4f7821329aa7111b;p=deliverable%2Flinux.git

drm/nouveau/gr/gf100: Clear notify interrupt

Notify interrupt is only used for cyclestats. We can just clear it and
avoid an "unknown stat" error that gets printed to dmesg otherwise.

Signed-off-by: Lauri Peltonen <lpeltonen@nvidia.com>
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 9707870a58c9..86c9515018d0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -1103,6 +1103,15 @@ gf100_gr_intr(struct nvkm_subdev *subdev)
 	engctx = nvkm_engctx_get(engine, inst);
 	chid   = pfifo->chid(pfifo, engctx);
 
+	if (stat & 0x00000001) {
+		/*
+		 * notifier interrupt, only needed for cyclestats
+		 * can be safely ignored
+		 */
+		nv_wr32(priv, 0x400100, 0x00000001);
+		stat &= ~0x00000001;
+	}
+
 	if (stat & 0x00000010) {
 		handle = nvkm_handle_get_class(engctx, class);
 		if (!handle || nv_call(handle->object, mthd, data)) {