commit 3c8868d3dbba5110bd43b49879f12d1a6b2a28ca
author Ben Skeggs <bskeggs@redhat.com> Wed Dec 16 14:51:13 2009 +1000
committer Ben Skeggs <bskeggs@redhat.com> Wed Dec 16 17:05:50 2009 +1000
tree 9417224a0c191d195c75a5a479b8de0ede9bb89d
parent 054b93e444550a72aef17115363cdef253b9ee7c

drm/nv50: fix two potential suspend/resume oopses

This avoids touching the dummy channel 0/127 we have on nv50.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

drivers/gpu/drm/nouveau/nouveau_drv.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 78662cc..58c7172 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -277,7 +277,7 @@
 
 		for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
 			chan = dev_priv->fifos[i];
-			if (!chan)
+			if (!chan || !chan->pushbuf_bo)
 				continue;
 
 			for (j = 0; j < NOUVEAU_DMA_SKIPS; j++)