Commit 3e98d829 authored by Roger He's avatar Roger He Committed by Alex Deucher
Browse files

drm/ttm: use an ttm operation ctx for ttm_bo_move_xxx 



include ttm_bo_move_memcpy and ttm_bo_move_ttm

Signed-off-by: default avatarRoger He <Hongbo.He@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4985c9fc

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

+3 −4
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict, 
	if (unlikely(r)) {

		goto out_cleanup;

	}

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

	r = ttm_bo_move_ttm(bo, ctx, new_mem);

out_cleanup:

	ttm_bo_mem_put(bo, &tmp_mem);

	return r;
@@ -536,7 +536,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict, 
	if (unlikely(r)) {

		return r;

	}

	r = ttm_bo_move_ttm(bo, ctx->interruptible, ctx->no_wait_gpu, &tmp_mem);

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

	if (unlikely(r)) {

		goto out_cleanup;

	}
@@ -597,8 +597,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, 


	if (r) {

memcpy:

		r = ttm_bo_move_memcpy(bo, ctx->interruptible,

				       ctx->no_wait_gpu, new_mem);

		r = ttm_bo_move_memcpy(bo, ctx, new_mem);

		if (r) {

			return r;

		}

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −4
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, 
	if (ret)

		goto out;



	ret = ttm_bo_move_ttm(bo, intr, no_wait_gpu, new_reg);

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

out:

	ttm_bo_mem_put(bo, &tmp_reg);

	return ret;
@@ -1255,7 +1255,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr, 
	if (ret)

		return ret;



	ret = ttm_bo_move_ttm(bo, intr, no_wait_gpu, &tmp_reg);

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

	if (ret)

		goto out;
@@ -1380,8 +1380,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);

	if (ret == 0)

		ret = ttm_bo_move_memcpy(bo, ctx->interruptible,

					 ctx->no_wait_gpu, new_reg);

		ret = ttm_bo_move_memcpy(bo, ctx, new_reg);



out:

	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA) {

drivers/gpu/drm/qxl/qxl_ttm.c

+1 −2
Original line number Diff line number Diff line
@@ -357,8 +357,7 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict, 
		qxl_move_null(bo, new_mem);

		return 0;

	}

	return ttm_bo_move_memcpy(bo, ctx->interruptible, ctx->no_wait_gpu,

				  new_mem);

	return ttm_bo_move_memcpy(bo, ctx, new_mem);

}



static void qxl_bo_move_notify(struct ttm_buffer_object *bo,

drivers/gpu/drm/radeon/radeon_ttm.c

+3 −4
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, 
	if (unlikely(r)) {

		goto out_cleanup;

	}

	r = ttm_bo_move_ttm(bo, interruptible, no_wait_gpu, new_mem);

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

out_cleanup:

	ttm_bo_mem_put(bo, &tmp_mem);

	return r;
@@ -380,7 +380,7 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo, 
	if (unlikely(r)) {

		return r;

	}

	r = ttm_bo_move_ttm(bo, interruptible, no_wait_gpu, &tmp_mem);

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

	if (unlikely(r)) {

		goto out_cleanup;

	}
@@ -445,8 +445,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, 


	if (r) {

memcpy:

		r = ttm_bo_move_memcpy(bo, ctx->interruptible,

				       ctx->no_wait_gpu, new_mem);

		r = ttm_bo_move_memcpy(bo, ctx, new_mem);

		if (r) {

			return r;

		}

drivers/gpu/drm/ttm/ttm_bo.c

+2 −4
Original line number Diff line number Diff line
@@ -324,13 +324,11 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, 


	if (!(old_man->flags & TTM_MEMTYPE_FLAG_FIXED) &&

	    !(new_man->flags & TTM_MEMTYPE_FLAG_FIXED))

		ret = ttm_bo_move_ttm(bo, ctx->interruptible,

				      ctx->no_wait_gpu, mem);

		ret = ttm_bo_move_ttm(bo, ctx, mem);

	else if (bdev->driver->move)

		ret = bdev->driver->move(bo, evict, ctx, mem);

	else

		ret = ttm_bo_move_memcpy(bo, ctx->interruptible,

					 ctx->no_wait_gpu, mem);

		ret = ttm_bo_move_memcpy(bo, ctx, mem);



	if (ret) {

		if (bdev->driver->move_notify) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE