diff options
| author | Ben Skeggs | 2017-01-18 09:40:48 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2017-02-17 08:38:16 +0100 |
| commit | 75d115f2aae145fd7dfed29703ce063e3e7bb716 (patch) | |
| tree | 1aa9f1cad5119b85f3feda323b8d222652fd6655 /drivers/gpu/drm/nouveau/nvkm/engine/fifo | |
| parent | drm/nouveau/fifo/gk104-: trigger mmu fault before attempting engine recovery (diff) | |
| download | kernel-qcow2-linux-75d115f2aae145fd7dfed29703ce063e3e7bb716.tar.gz kernel-qcow2-linux-75d115f2aae145fd7dfed29703ce063e3e7bb716.tar.xz kernel-qcow2-linux-75d115f2aae145fd7dfed29703ce063e3e7bb716.zip | |
drm/nouveau/fifo/gk104-: preempt 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/gpfifogk104.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c index 7f5386910162..8abf6f8ef445 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c @@ -50,6 +50,7 @@ gk104_fifo_gpfifo_kick(struct gk104_fifo_chan *chan) ) < 0) { nvkm_error(subdev, "channel %d [%s] kick timeout\n", chan->base.chid, client->name); + nvkm_fifo_recover_chan(&fifo->base, chan->base.chid); ret = -ETIMEDOUT; } mutex_unlock(&subdev->mutex); |