Commit 0ef1ed81 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: add bo wait that takes a ctx wrapper. 



I'm thinking of pushing the wait into the drivers.

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/20200923030454.362731-6-airlied@gmail.com
parent 54661867

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -1062,7 +1062,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, 
	struct nouveau_drm_tile *new_tile = NULL;

	int ret = 0;



	ret = ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu);

	ret = ttm_bo_wait_ctx(bo, ctx);

	if (ret)

		return ret;
@@ -1097,7 +1097,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, 
	}



	/* Fallback to software copy. */

	ret = ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu);

	ret = ttm_bo_wait_ctx(bo, ctx);

	if (ret == 0)

		ret = ttm_bo_move_memcpy(bo, ctx, new_reg);

drivers/gpu/drm/qxl/qxl_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict, 
	struct ttm_resource *old_mem = &bo->mem;

	int ret;



	ret = ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu);

	ret = ttm_bo_wait_ctx(bo, ctx);

	if (ret)

		return ret;

drivers/gpu/drm/radeon/radeon_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, 
	struct ttm_resource *old_mem = &bo->mem;

	int r;



	r = ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu);

	r = ttm_bo_wait_ctx(bo, ctx);

	if (r)

		return r;

drivers/gpu/drm/ttm/ttm_bo_util.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, 
	int ret;



	if (old_mem->mem_type != TTM_PL_SYSTEM) {

		ret = ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu);

		ret = ttm_bo_wait_ctx(bo, ctx);



		if (unlikely(ret != 0)) {

			if (ret != -ERESTARTSYS)
@@ -231,7 +231,7 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, 
	unsigned long add = 0;

	int dir;



	ret = ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu);

	ret = ttm_bo_wait_ctx(bo, ctx);

	if (ret)

		return ret;

include/drm/ttm/ttm_bo_api.h

+5 −0
Original line number Diff line number Diff line
@@ -261,6 +261,11 @@ ttm_bo_get_unless_zero(struct ttm_buffer_object *bo) 
 */

int ttm_bo_wait(struct ttm_buffer_object *bo, bool interruptible, bool no_wait);



static inline int ttm_bo_wait_ctx(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx)

{

	return ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu);

}



/**

 * ttm_bo_mem_compat - Check if proposed placement is compatible with a bo

 *