2 files changed, 2 insertions, 2 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)
 
                 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++)
diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
index 77ae1aaa0bce..b7282284f080 100644
--- a/drivers/gpu/drm/nouveau/nv50_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
@@ -416,7 +416,7 @@ nv50_fifo_unload_context(struct drm_device *dev)
         NV_DEBUG(dev, "\n");
 
         chid = pfifo->channel_id(dev);
-        if (chid < 0 || chid >= dev_priv->engine.fifo.channels)
+        if (chid < 1 || chid >= dev_priv->engine.fifo.channels - 1)
                 return 0;
 
         chan = dev_priv->fifos[chid];