summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-12-09 09:02:17 +0100
committerBen Skeggs <bskeggs@redhat.com>2016-12-13 02:38:51 +0100
commit48dac93506973eadb27769bb7486340096c7f2f7 (patch)
tree904394a52dd06f456330b39240bb76880d38cc09
parentdrm/nouveau/fifo/gf100-: recover from host mmu faults (diff)
downloadlinux-48dac93506973eadb27769bb7486340096c7f2f7.tar.xz
linux-48dac93506973eadb27769bb7486340096c7f2f7.zip
drm/nouveau/gr/gf100-: properly ack all FECS error interrupts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 60a1b5c8214b..6a8551053b47 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -1270,12 +1270,11 @@ gf100_gr_ctxctl_isr(struct gf100_gr *gr)
nvkm_error(subdev, "FECS MTHD subc %d class %04x "
"mthd %04x data %08x\n",
subc, class, mthd, data);
-
- nvkm_wr32(device, 0x409c20, 0x00000001);
- stat &= ~0x00000001;
} else {
nvkm_error(subdev, "FECS ucode error %d\n", code);
}
+ nvkm_wr32(device, 0x409c20, 0x00000001);
+ stat &= ~0x00000001;
}
if (stat & 0x00080000) {