diff options
| author | Ben Skeggs | 2017-01-18 07:05:15 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2017-02-17 08:38:15 +0100 |
| commit | 03f16f5f278af9ef477aa847fda4b09ed87dc382 (patch) | |
| tree | 752f243390539787ab05c33513634c1d96e4ffc4 /drivers/gpu/drm/nouveau/nvkm/engine/fifo | |
| parent | drm/nouveau/fifo/gk104-: directly use new recovery code for ctxsw timeout (diff) | |
| download | kernel-qcow2-linux-03f16f5f278af9ef477aa847fda4b09ed87dc382.tar.gz kernel-qcow2-linux-03f16f5f278af9ef477aa847fda4b09ed87dc382.tar.xz kernel-qcow2-linux-03f16f5f278af9ef477aa847fda4b09ed87dc382.zip | |
drm/nouveau/fifo/gk104-: ACK SCHED_ERROR before attempting CTXSW_TIMEOUT recovery
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/fifo')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c index 52aedd891e80..e4e68f6fb138 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c @@ -338,10 +338,17 @@ gk104_fifo_sched_reason[] = { static void gk104_fifo_intr_sched_ctxsw(struct gk104_fifo *fifo) { + struct nvkm_device *device = fifo->base.engine.subdev.device; unsigned long flags, engm = 0; u32 engn; + /* We need to ACK the SCHED_ERROR here, and prevent it reasserting, + * as MMU_FAULT cannot be triggered while it's pending. + */ spin_lock_irqsave(&fifo->base.lock, flags); + nvkm_mask(device, 0x002140, 0x00000100, 0x00000000); + nvkm_wr32(device, 0x002100, 0x00000100); + for (engn = 0; engn < fifo->engine_nr; engn++) { struct gk104_fifo_engine_status status; @@ -355,6 +362,7 @@ gk104_fifo_intr_sched_ctxsw(struct gk104_fifo *fifo) for_each_set_bit(engn, &engm, fifo->engine_nr) gk104_fifo_recover_engn(fifo, engn); + nvkm_mask(device, 0x002140, 0x00000100, 0x00000100); spin_unlock_irqrestore(&fifo->base.lock, flags); } |