projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3ebef76
)
drm/nouveau/fifo/gk104-: preempt recovery
author
Ben Skeggs
<
[email protected]
>
Wed, 18 Jan 2017 08:40:48 +0000
(18:40 +1000)
committer
Ben Skeggs
<
[email protected]
>
Fri, 17 Feb 2017 07:38:16 +0000
(17:38 +1000)
Signed-off-by: Ben Skeggs <
[email protected]
>
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
index 7f53869101620a02d991bd862853edcffcdc41fe..8abf6f8ef445d3fc90564ad0a1894ec2e09dc0b8 100644
(file)
--- 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);