Commit a07e32bd authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: use new move interface for known system->ttm moves 



In all 3 drivers there is a case where the driver knows the
bo is in SYSTEM so don't call the api that checks that.

Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201019071314.1671485-4-airlied@gmail.com
parent b8b99c7d

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+2 −2
Original line number Diff line number Diff line
@@ -601,11 +601,11 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict, 
	}



	/* move/bind old memory to GTT space */

	r = ttm_bo_move_ttm(bo, ctx, &tmp_mem);

	r = ttm_bo_move_to_new_tt_mem(bo, ctx, &tmp_mem);

	if (unlikely(r)) {

		goto out_cleanup;

	}



	ttm_bo_assign_mem(bo, &tmp_mem);

	/* copy to VRAM */

	r = amdgpu_move_blit(bo, evict, new_mem, old_mem);

	if (unlikely(r)) {

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −1
Original line number Diff line number Diff line
@@ -927,10 +927,11 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, 
	if (ret)

		return ret;



	ret = ttm_bo_move_ttm(bo, ctx, &tmp_reg);

	ret = ttm_bo_move_to_new_tt_mem(bo, ctx, &tmp_reg);

	if (ret)

		goto out;



	ttm_bo_assign_mem(bo, &tmp_reg);

	ret = nouveau_bo_move_m2mf(bo, true, ctx, new_reg);

	if (ret)

		goto out;

drivers/gpu/drm/radeon/radeon_ttm.c

+2 −1
Original line number Diff line number Diff line
@@ -275,10 +275,11 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo, 
	if (unlikely(r)) {

		return r;

	}

	r = ttm_bo_move_ttm(bo, ctx, &tmp_mem);

	r = ttm_bo_move_to_new_tt_mem(bo, ctx, &tmp_mem);

	if (unlikely(r)) {

		goto out_cleanup;

	}

	ttm_bo_assign_mem(bo, &tmp_mem);

	r = radeon_move_blit(bo, true, new_mem, old_mem);

	if (unlikely(r)) {

		goto out_cleanup;

drivers/gpu/drm/ttm/ttm_bo_util.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ int ttm_bo_move_to_new_tt_mem(struct ttm_buffer_object *bo, 


	return 0;

}

EXPORT_SYMBOL(ttm_bo_move_to_new_tt_mem);



static int ttm_bo_move_to_system(struct ttm_buffer_object *bo,

				 struct ttm_operation_ctx *ctx)