diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2009-12-15 23:51:13 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2009-12-16 02:05:50 -0500 |
commit | 3c8868d3dbba5110bd43b49879f12d1a6b2a28ca (patch) | |
tree | 9417224a0c191d195c75a5a479b8de0ede9bb89d /drivers/gpu/drm/nouveau/nouveau_drv.c | |
parent | 054b93e444550a72aef17115363cdef253b9ee7c (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 78662cc1c8d5..58c717247f26 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c | |||
@@ -277,7 +277,7 @@ nouveau_pci_resume(struct pci_dev *pdev) | |||
277 | 277 | ||
278 | for (i = 0; i < dev_priv->engine.fifo.channels; i++) { | 278 | for (i = 0; i < dev_priv->engine.fifo.channels; i++) { |
279 | chan = dev_priv->fifos[i]; | 279 | chan = dev_priv->fifos[i]; |
280 | if (!chan) | 280 | if (!chan || !chan->pushbuf_bo) |
281 | continue; | 281 | continue; |
282 | 282 | ||
283 | for (j = 0; j < NOUVEAU_DMA_SKIPS; j++) | 283 | for (j = 0; j < NOUVEAU_DMA_SKIPS; j++) |