drm/nouveau/gr/gf100-: handle GPC/TPC/MPC trap

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index b3d00ade7d821cb9df304e7ccb30f5f39e5cffb2..f65a5b0a1a4d6269f986a34d69cdaa487a69b879 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -1041,6 +1041,13 @@ gf100_gr_trap_tpc(struct gf100_gr *gr, int gpc, int tpc)
                stat &= ~0x00000008;
        }
 
+       if (stat & 0x00000010) {
+               u32 trap = nvkm_rd32(device, TPC_UNIT(gpc, tpc, 0x0430));
+               nvkm_error(subdev, "GPC%d/TPC%d/MPC: %08x\n", gpc, tpc, trap);
+               nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x0430), 0xc0000000);
+               stat &= ~0x00000010;
+       }
+
        if (stat) {
                nvkm_error(subdev, "GPC%d/TPC%d/%08x: unknown\n", gpc, tpc, stat);
        }