1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index c1d7301c0e9c..174300b6a02e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -76,6 +76,8 @@ nouveau_channel_del(struct nouveau_channel **pchan)
                 nouveau_object_del(client, NVDRM_DEVICE, chan->push.handle);
                 nouveau_bo_vma_del(chan->push.buffer, &chan->push.vma);
                 nouveau_bo_unmap(chan->push.buffer);
+                if (chan->push.buffer && chan->push.buffer->pin_refcnt)
+                        nouveau_bo_unpin(chan->push.buffer);
                 nouveau_bo_ref(NULL, &chan->push.buffer);
                 kfree(chan);
         }
@@ -267,7 +269,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
         struct nouveau_fb *pfb = nouveau_fb(device);
         struct nouveau_software_chan *swch;
         struct nouveau_object *object;
-        struct nv_dma_class args;
+        struct nv_dma_class args = {};
         int ret, i;
 
         /* allocate dma objects to cover all allowed vram, and gart */
@@ -346,7 +348,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
         /* allocate software object class (used for fences on <= nv05, and
          * to signal flip completion), bind it to a subchannel.
          */
-        if (chan != chan->drm->cechan) {
+        if ((device->card_type < NV_E0) || gart /* nve0: want_nvsw */) {
                 ret = nouveau_object_new(nv_object(client), chan->handle,
                                          NvSw, nouveau_abi16_swclass(chan->drm),
                                          NULL, 0, &object);