drm/nouveau: unpin various bo's before destroying

These objects leak VRAM - but only on module unload.

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/gpu/drm/nouveau/nvc0_fence.c b/drivers/gpu/drm/nouveau/nvc0_fence.c
index 2747baaa3c39..2a56b1b551cb 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fence.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fence.c
@@ -190,6 +190,8 @@ nvc0_fence_destroy(struct nouveau_drm *drm)
 {
         struct nvc0_fence_priv *priv = drm->fence;
         nouveau_bo_unmap(priv->bo);
+        if (priv->bo)
+                nouveau_bo_unpin(priv->bo);
         nouveau_bo_ref(NULL, &priv->bo);
         drm->fence = NULL;
         kfree(priv);
@@ -219,8 +221,11 @@ nvc0_fence_create(struct nouveau_drm *drm)
                              TTM_PL_FLAG_VRAM, 0, 0, NULL, &priv->bo);
         if (ret == 0) {
                 ret = nouveau_bo_pin(priv->bo, TTM_PL_FLAG_VRAM);
-                if (ret == 0)
+                if (ret == 0) {
                         ret = nouveau_bo_map(priv->bo);
+                        if (ret)
+                                nouveau_bo_unpin(priv->bo);
+                }
                 if (ret)
                         nouveau_bo_ref(NULL, &priv->bo);
         }