drm/nouveau: clean up nouveau_bo_move_ntfy

Just another leftover from a TTM cleanup.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210315191432.153826-2-christian.koenig@amd.com

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 281e9ed139895f4d4f18e65ea67a67f59f843b27..2d5d68fc15c2423f7f42de6d3bff9b0632d3ac6d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -886,9 +886,8 @@ nouveau_bo_move_init(struct nouveau_drm *drm)
        NV_INFO(drm, "MM: using %s for buffer copies\n", name);
 }
 
-static void
-nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, bool evict,
-                    struct ttm_resource *new_reg)
+static void nouveau_bo_move_ntfy(struct ttm_buffer_object *bo,
+                                struct ttm_resource *new_reg)
 {
        struct nouveau_mem *mem = new_reg ? nouveau_mem(new_reg) : NULL;
        struct nouveau_bo *nvbo = nouveau_bo(bo);
@@ -974,7 +973,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
                        return ret;
        }
 
-       nouveau_bo_move_ntfy(bo, evict, new_reg);
+       nouveau_bo_move_ntfy(bo, new_reg);
        ret = ttm_bo_wait_ctx(bo, ctx);
        if (ret)
                goto out_ntfy;
@@ -1039,9 +1038,7 @@ out:
        }
 out_ntfy:
        if (ret) {
-               swap(*new_reg, bo->mem);
-               nouveau_bo_move_ntfy(bo, false, new_reg);
-               swap(*new_reg, bo->mem);
+               nouveau_bo_move_ntfy(bo, &bo->mem);
        }
        return ret;
 }
@@ -1315,7 +1312,7 @@ nouveau_bo_fence(struct nouveau_bo *nvbo, struct nouveau_fence *fence, bool excl
 static void
 nouveau_bo_delete_mem_notify(struct ttm_buffer_object *bo)
 {
-       nouveau_bo_move_ntfy(bo, false, NULL);
+       nouveau_bo_move_ntfy(bo, NULL);
 }
 
 struct ttm_device_funcs nouveau_bo_driver = {