]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/nouveau/disp/gv100-: halt NV_PDISP_FE_RM_INTR_STAT_CTRL_DISP_ERROR storms
authorBen Skeggs <bskeggs@redhat.com>
Mon, 3 Feb 2020 06:58:45 +0000 (01:58 -0500)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 3 Feb 2020 11:36:54 +0000 (21:36 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c

index 3aa2cc3af1e2463b44de94a1dd2e119450af305d..c1032527f79111aaa237cfd51e33b01f574eebf4 100644 (file)
@@ -155,6 +155,12 @@ gv100_disp_intr_ctrl_disp(struct nv50_disp *disp)
        if (stat & 0x00000008)
                stat &= ~0x00000008;
 
+       if (stat & 0x00000080) {
+               u32 error = nvkm_mask(device, 0x611848, 0x00000000, 0x00000000);
+               nvkm_warn(subdev, "error %08x\n", error);
+               stat &= ~0x00000080;
+       }
+
        if (stat & 0x00000100) {
                unsigned long wndws = nvkm_rd32(device, 0x611858);
                unsigned long other = nvkm_rd32(device, 0x61185c);