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

drm/ttm: split out the move to system from move ttm code 



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-3-airlied@gmail.com
parent 87ed9423

drivers/gpu/drm/ttm/ttm_bo_util.c

+25 −14
Original line number Diff line number Diff line
@@ -65,16 +65,16 @@ int ttm_bo_move_to_new_tt_mem(struct ttm_buffer_object *bo, 
	return 0;

}



int ttm_bo_move_ttm(struct ttm_buffer_object *bo,

		   struct ttm_operation_ctx *ctx,

		    struct ttm_resource *new_mem)

static int ttm_bo_move_to_system(struct ttm_buffer_object *bo,

				 struct ttm_operation_ctx *ctx)

{

	struct ttm_resource *old_mem = &bo->mem;

	int ret;



	if (old_mem->mem_type != TTM_PL_SYSTEM) {

		ret = ttm_bo_wait_ctx(bo, ctx);

	if (old_mem->mem_type == TTM_PL_SYSTEM)

		return 0;



	ret = ttm_bo_wait_ctx(bo, ctx);

	if (unlikely(ret != 0)) {

		if (ret != -ERESTARTSYS)

			pr_err("Failed to expire sync object before unbinding TTM\n");
@@ -84,8 +84,19 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, 
	ttm_bo_tt_unbind(bo);

	ttm_resource_free(bo, &bo->mem);

	old_mem->mem_type = TTM_PL_SYSTEM;

	return 0;

}



int ttm_bo_move_ttm(struct ttm_buffer_object *bo,

		   struct ttm_operation_ctx *ctx,

		    struct ttm_resource *new_mem)

{

	int ret;



	ret = ttm_bo_move_to_system(bo, ctx);

	if (unlikely(ret != 0))

		return ret;



	ret = ttm_bo_move_to_new_tt_mem(bo, ctx, new_mem);

	if (unlikely(ret != 0))

		return ret;