From: Ben Skeggs Date: Fri, 11 Mar 2016 03:09:28 +0000 (+1000) Subject: drm/nouveau/fifo/gk104: submit NOP after all PBDMA_INTR_0, not just DEVICE X-Git-Tag: Ubuntu-5.0.0-8.9~7573^2~14^2~19 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b4c5fc4b853a1d508cbd3133f5d363037bfd5844;p=mirror_ubuntu-disco-kernel.git drm/nouveau/fifo/gk104: submit NOP after all PBDMA_INTR_0, not just DEVICE Prevents the same interrupt from re-triggering forever. Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c index a1b30133ae19..68acb36b3e6d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c @@ -490,9 +490,10 @@ gk104_fifo_intr_pbdma_0(struct gk104_fifo *fifo, int unit) if (nvkm_sw_mthd(device->sw, chid, subc, mthd, data)) show &= ~0x00800000; } - nvkm_wr32(device, 0x0400c0 + (unit * 0x2000), 0x80600008); } + nvkm_wr32(device, 0x0400c0 + (unit * 0x2000), 0x80600008); + if (show) { nvkm_snprintbf(msg, sizeof(msg), gk104_fifo_pbdma_intr_0, show); chan = nvkm_fifo_chan_chid(&fifo->base, chid, &flags);