diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-12-09 09:50:23 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-12-13 02:38:52 +0100 |
| commit | 732be80743e72a2e9f04e8a9f369f0c6432b85d1 (patch) | |
| tree | 2eac6d900fa2adf450b15159013eca01e2ceb195 /drivers/gpu/drm | |
| parent | drm/nouveau/gr/gf100-: properly ack all FECS error interrupts (diff) | |
| download | linux-732be80743e72a2e9f04e8a9f369f0c6432b85d1.tar.xz linux-732be80743e72a2e9f04e8a9f369f0c6432b85d1.zip | |
drm/nouveau/gr/gf100-: FECS intr handling is not relevant on proprietary ucode
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c index 6a8551053b47..b3d00ade7d82 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c @@ -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); |