Commit 84cd0a55 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: check for dead channel before trying to idle

This prevents *very* long waits while attempting to destroy channels
after a fault has occurred.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent d8cc37d8
...@@ -58,7 +58,7 @@ nouveau_channel_killed(struct nvif_notify *ntfy) ...@@ -58,7 +58,7 @@ nouveau_channel_killed(struct nvif_notify *ntfy)
int int
nouveau_channel_idle(struct nouveau_channel *chan) nouveau_channel_idle(struct nouveau_channel *chan)
{ {
if (likely(chan && chan->fence)) { if (likely(chan && chan->fence && !atomic_read(&chan->killed))) {
struct nouveau_cli *cli = (void *)chan->user.client; struct nouveau_cli *cli = (void *)chan->user.client;
struct nouveau_fence *fence = NULL; struct nouveau_fence *fence = NULL;
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment