drm/nouveau/gr/gf100-: FECS intr handling is not relevant on proprietary ucode
authorBen Skeggs <bskeggs@redhat.com>
Fri, 9 Dec 2016 08:50:23 +0000 (18:50 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 13 Dec 2016 01:38:52 +0000 (11:38 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c

index 6a8551053b47eb77469f5bd19cfdc699cc3e5adf..b3d00ade7d821cb9df304e7ccb30f5f39e5cffb2 100644 (file)
@@ -1258,7 +1258,7 @@ gf100_gr_ctxctl_isr(struct gf100_gr *gr)
        struct nvkm_device *device = subdev->device;
        u32 stat = nvkm_rd32(device, 0x409c18);
 
-       if (stat & 0x00000001) {
+       if (!gr->firmware && (stat & 0x00000001)) {
                u32 code = nvkm_rd32(device, 0x409814);
                if (code == E_BAD_FWMTHD) {
                        u32 class = nvkm_rd32(device, 0x409808);
@@ -1277,7 +1277,7 @@ gf100_gr_ctxctl_isr(struct gf100_gr *gr)
                stat &= ~0x00000001;
        }
 
-       if (stat & 0x00080000) {
+       if (!gr->firmware && (stat & 0x00080000)) {
                nvkm_error(subdev, "FECS watchdog timeout\n");
                gf100_gr_ctxctl_debug(gr);
                nvkm_wr32(device, 0x409c20, 0x00080000);