drm/nouveau/fifo/gk104-: preempt recovery
authorBen Skeggs <bskeggs@redhat.com>
Wed, 18 Jan 2017 08:40:48 +0000 (18:40 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 17 Feb 2017 07:38:16 +0000 (17:38 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c

index 7f53869101620a02d991bd862853edcffcdc41fe..8abf6f8ef445d3fc90564ad0a1894ec2e09dc0b8 100644 (file)
@@ -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);