From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 11 Oct 2013 04:56:39 +0000 (+1000)
Subject: drm/nouveau/mc: fetch NV_PMC_INTR again after re-arming MSI
X-Git-Tag: v3.13-rc8~13^2~72
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c792a15ec799c27d634b102b605f3ec32c033c3;p=kernel%2Fkernel-generic.git

drm/nouveau/mc: fetch NV_PMC_INTR again after re-arming MSI

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

diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c
index b643722..525d40d 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c
@@ -31,7 +31,7 @@ nouveau_mc_intr(int irq, void *arg)
 	struct nouveau_mc *pmc = arg;
 	const struct nouveau_mc_intr *map = pmc->intr_map;
 	struct nouveau_subdev *unit;
-	u32 intr, stat;
+	u32 intr;
 
 	nv_wr32(pmc, 0x000140, 0x00000000);
 	nv_rd32(pmc, 0x000140);
@@ -40,7 +40,11 @@ nouveau_mc_intr(int irq, void *arg)
 	if (intr == 0xffffffff) /* likely fallen off the bus */
 		intr = 0x00000000;
 
-	if ((stat = intr) != 0) {
+	if (pmc->use_msi)
+		nv_wr08(pmc, 0x088068, 0xff);
+
+	if (intr) {
+		u32 stat = nv_rd32(pmc, 0x000100);
 		while (map->stat) {
 			if (intr & map->stat) {
 				unit = nouveau_subdev(pmc, map->unit);
@@ -51,8 +55,6 @@ nouveau_mc_intr(int irq, void *arg)
 			map++;
 		}
 
-		if (pmc->use_msi)
-			nv_wr08(pmc, 0x088068, 0xff);
 		if (stat)
 			nv_error(pmc, "unknown intr 0x%08x\n", stat);
 	}