Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+1 -1
+1 -1
drivers/gpu/drm/nouveau/nouveau_chan.c
··· 58 58 int 59 59 nouveau_channel_idle(struct nouveau_channel *chan) 60 60 { 61 - if (likely(chan && chan->fence)) { 61 + if (likely(chan && chan->fence && !atomic_read(&chan->killed))) { 62 62 struct nouveau_cli *cli = (void *)chan->user.client; 63 63 struct nouveau_fence *fence = NULL; 64 64 int ret;