drm/ttm: introduce utility function to free an allocated memory node

Existing core code/drivers call drm_mm_put_block on ttm_mem_reg.mm_node
directly.  Future patches will modify TTM behaviour in such a way that
ttm_mem_reg.mm_node doesn't necessarily belong to drm_mm.

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Acked-by: Thomas Hellström <thellstrom@vmware.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 2 insertions, 12 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 4e813638bdb7..f685f392c226 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -693,12 +693,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
 
         ret = ttm_bo_move_ttm(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);
 out:
-        if (tmp_mem.mm_node) {
-                spin_lock(&bo->bdev->glob->lru_lock);
-                drm_mm_put_block(tmp_mem.mm_node);
-                spin_unlock(&bo->bdev->glob->lru_lock);
-        }
-
+        ttm_bo_mem_put(bo, &tmp_mem);
         return ret;
 }
 
@@ -731,12 +726,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
                 goto out;
 
 out:
-        if (tmp_mem.mm_node) {
-                spin_lock(&bo->bdev->glob->lru_lock);
-                drm_mm_put_block(tmp_mem.mm_node);
-                spin_unlock(&bo->bdev->glob->lru_lock);
-        }
-
+        ttm_bo_mem_put(bo, &tmp_mem);
         return ret;
 }