Commit 5ea143c3 authored by Christian König's avatar Christian König
Browse files

drm/nouveau: clean up nouveau_bo_move_ntfy 



Just another leftover from a TTM cleanup.

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

drivers/gpu/drm/nouveau/nouveau_bo.c

+5 −8
Original line number Diff line number Diff line
@@ -886,8 +886,7 @@ 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,

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;
@@ -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 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, 
	}

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 = {