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: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index 3b3d071b151e096824a3662f3cc7ad88f5b02564..dbc41fa86ee8bf8f36666dfbb27ebc4daf2884d6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -58,7 +58,7 @@ nouveau_channel_killed(struct nvif_notify *ntfy)
 int
 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_fence *fence = NULL;
                int ret;