diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-12-09 18:50:23 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-12-09 18:52:32 +1000 |
| commit | 32ae7e7f00a2d7a334674f2daa0ecec474b49ba4 (patch) | |
| tree | ce2e8019fa3a0ae3d14d412d7664766c369b4ccb | |
| parent | 86abf49eedfedede1404154792c78851a328bcd1 (diff) | |
| download | nouveau-32ae7e7f00a2d7a334674f2daa0ecec474b49ba4.tar.gz | |
gr/gf100-: FECS intr handling is not relevant on proprietary ucode
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/gf100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/nouveau/nvkm/engine/gr/gf100.c b/drm/nouveau/nvkm/engine/gr/gf100.c index 6a8551053..b3d00ade7 100644 --- a/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/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); |