summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_chan.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2020-01-23 15:39:27 +1000
committerBen Skeggs <bskeggs@redhat.com>2020-01-29 15:49:47 +1000
commitea13e5abf807ea912ce84eef6a1946b9a38c6508 (patch)
treef761dece1ffcc1e84f6b7721fae733428a59e412 /drivers/gpu/drm/nouveau/nouveau_chan.c
parent0181f4bfbdcdfdf8474946bf14fd644727fb8363 (diff)
downloadlinux-stable-ea13e5abf807ea912ce84eef6a1946b9a38c6508.tar.gz
linux-stable-ea13e5abf807ea912ce84eef6a1946b9a38c6508.tar.bz2
linux-stable-ea13e5abf807ea912ce84eef6a1946b9a38c6508.zip
drm/nouveau: signal pending fences when channel has been killed
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_chan.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_chan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index 282fd90b65e1..d9381a053169 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -55,6 +55,8 @@ nouveau_channel_killed(struct nvif_notify *ntfy)
struct nouveau_cli *cli = (void *)chan->user.client;
NV_PRINTK(warn, cli, "channel %d killed!\n", chan->chid);
atomic_set(&chan->killed, 1);
+ if (chan->fence)
+ nouveau_fence_context_kill(chan->fence, -ENODEV);
return NVIF_NOTIFY_DROP;
}