From: Ben Skeggs Date: Fri, 11 Oct 2013 04:42:47 +0000 (+1000) Subject: drm/nouveau/mc: bracket interrupt handler with NV_PMC_INTR_EN disable/re-enable X-Git-Tag: firefly_0821_release~176^2~4694^2~73 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ab5beca895335856ed9cb749aee8a2aabde0c247;p=firefly-linux-kernel-4.4.55.git drm/nouveau/mc: bracket interrupt handler with NV_PMC_INTR_EN disable/re-enable This looks to be what NVIDIA do pretty much everywhere, since forever. Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c index f26fcbd2237d..b64372298f14 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c @@ -33,6 +33,9 @@ nouveau_mc_intr(int irq, void *arg) struct nouveau_subdev *unit; u32 intr, stat; + nv_wr32(pmc, 0x000140, 0x00000000); + nv_rd32(pmc, 0x000140); + intr = nv_rd32(pmc, 0x000100); if (intr == 0xffffffff) /* likely fallen off the bus */ intr = 0x00000000; @@ -54,6 +57,7 @@ nouveau_mc_intr(int irq, void *arg) nv_error(pmc, "unknown intr 0x%08x\n", stat); } + nv_wr32(pmc, 0x000140, 0x00000001); return intr ? IRQ_HANDLED : IRQ_NONE; }