Commit 2823f4f0 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: add context to driver move callback as well 



Instead of passing the parameters manually.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Tested-by: default avatarDieter Nützel <Dieter@nuetzel-hh.de>
Tested-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 83876c1b

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

+11 −10
Original line number Diff line number Diff line
@@ -553,9 +553,8 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, 
	return r;

}



static int amdgpu_bo_move(struct ttm_buffer_object *bo,

			bool evict, bool interruptible,

			bool no_wait_gpu,

static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,

			  struct ttm_operation_ctx *ctx,

			  struct ttm_mem_reg *new_mem)

{

	struct amdgpu_device *adev;
@@ -591,19 +590,21 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, 


	if (old_mem->mem_type == TTM_PL_VRAM &&

	    new_mem->mem_type == TTM_PL_SYSTEM) {

		r = amdgpu_move_vram_ram(bo, evict, interruptible,

					no_wait_gpu, new_mem);

		r = amdgpu_move_vram_ram(bo, evict, ctx->interruptible,

					ctx->no_wait_gpu, new_mem);

	} else if (old_mem->mem_type == TTM_PL_SYSTEM &&

		   new_mem->mem_type == TTM_PL_VRAM) {

		r = amdgpu_move_ram_vram(bo, evict, interruptible,

					    no_wait_gpu, new_mem);

		r = amdgpu_move_ram_vram(bo, evict, ctx->interruptible,

					    ctx->no_wait_gpu, new_mem);

	} else {

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

		r = amdgpu_move_blit(bo, evict, ctx->no_wait_gpu,

				     new_mem, old_mem);

	}



	if (r) {

memcpy:

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

		r = ttm_bo_move_memcpy(bo, ctx->interruptible,

				       ctx->no_wait_gpu, new_mem);

		if (r) {

			return r;

		}

drivers/gpu/drm/nouveau/nouveau_bo.c

+16 −11
Original line number Diff line number Diff line
@@ -1328,8 +1328,9 @@ nouveau_bo_vm_cleanup(struct ttm_buffer_object *bo, 
}



static int

nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,

		bool no_wait_gpu, struct ttm_mem_reg *new_reg)

nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,

		struct ttm_operation_ctx *ctx,

		struct ttm_mem_reg *new_reg)

{

	struct nouveau_drm *drm = nouveau_bdev(bo->bdev);

	struct nouveau_bo *nvbo = nouveau_bo(bo);
@@ -1337,7 +1338,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr, 
	struct nouveau_drm_tile *new_tile = NULL;

	int ret = 0;



	ret = ttm_bo_wait(bo, intr, no_wait_gpu);

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

	if (ret)

		return ret;
@@ -1361,22 +1362,26 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr, 
	/* Hardware assisted copy. */

	if (drm->ttm.move) {

		if (new_reg->mem_type == TTM_PL_SYSTEM)

			ret = nouveau_bo_move_flipd(bo, evict, intr,

						    no_wait_gpu, new_reg);

			ret = nouveau_bo_move_flipd(bo, evict,

						    ctx->interruptible,

						    ctx->no_wait_gpu, new_reg);

		else if (old_reg->mem_type == TTM_PL_SYSTEM)

			ret = nouveau_bo_move_flips(bo, evict, intr,

						    no_wait_gpu, new_reg);

			ret = nouveau_bo_move_flips(bo, evict,

						    ctx->interruptible,

						    ctx->no_wait_gpu, new_reg);

		else

			ret = nouveau_bo_move_m2mf(bo, evict, intr,

						   no_wait_gpu, new_reg);

			ret = nouveau_bo_move_m2mf(bo, evict,

						   ctx->interruptible,

						   ctx->no_wait_gpu, new_reg);

		if (!ret)

			goto out;

	}



	/* Fallback to software copy. */

	ret = ttm_bo_wait(bo, intr, no_wait_gpu);

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

	if (ret == 0)

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

		ret = ttm_bo_move_memcpy(bo, ctx->interruptible,

					 ctx->no_wait_gpu, new_reg);



out:

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

drivers/gpu/drm/qxl/qxl_ttm.c

+4 −5
Original line number Diff line number Diff line
@@ -341,15 +341,14 @@ static void qxl_move_null(struct ttm_buffer_object *bo, 
	new_mem->mm_node = NULL;

}



static int qxl_bo_move(struct ttm_buffer_object *bo,

		       bool evict, bool interruptible,

		       bool no_wait_gpu,

static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict,

		       struct ttm_operation_ctx *ctx,

		       struct ttm_mem_reg *new_mem)

{

	struct ttm_mem_reg *old_mem = &bo->mem;

	int ret;



	ret = ttm_bo_wait(bo, interruptible, no_wait_gpu);

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

	if (ret)

		return ret;
@@ -358,7 +357,7 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, 
		qxl_move_null(bo, new_mem);

		return 0;

	}

	return ttm_bo_move_memcpy(bo, interruptible, no_wait_gpu,

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

				  new_mem);

}

drivers/gpu/drm/radeon/radeon_ttm.c

+12 −11
Original line number Diff line number Diff line
@@ -393,9 +393,8 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo, 
	return r;

}



static int radeon_bo_move(struct ttm_buffer_object *bo,

			bool evict, bool interruptible,

			bool no_wait_gpu,

static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,

			  struct ttm_operation_ctx *ctx,

			  struct ttm_mem_reg *new_mem)

{

	struct radeon_device *rdev;
@@ -403,7 +402,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, 
	struct ttm_mem_reg *old_mem = &bo->mem;

	int r;



	r = ttm_bo_wait(bo, interruptible, no_wait_gpu);

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

	if (r)

		return r;
@@ -433,19 +432,21 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, 


	if (old_mem->mem_type == TTM_PL_VRAM &&

	    new_mem->mem_type == TTM_PL_SYSTEM) {

		r = radeon_move_vram_ram(bo, evict, interruptible,

					no_wait_gpu, new_mem);

		r = radeon_move_vram_ram(bo, evict, ctx->interruptible,

					ctx->no_wait_gpu, new_mem);

	} else if (old_mem->mem_type == TTM_PL_SYSTEM &&

		   new_mem->mem_type == TTM_PL_VRAM) {

		r = radeon_move_ram_vram(bo, evict, interruptible,

					    no_wait_gpu, new_mem);

		r = radeon_move_ram_vram(bo, evict, ctx->interruptible,

					    ctx->no_wait_gpu, new_mem);

	} else {

		r = radeon_move_blit(bo, evict, no_wait_gpu, new_mem, old_mem);

		r = radeon_move_blit(bo, evict, ctx->no_wait_gpu,

				     new_mem, old_mem);

	}



	if (r) {

memcpy:

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

		r = ttm_bo_move_memcpy(bo, ctx->interruptible,

				       ctx->no_wait_gpu, new_mem);

		if (r) {

			return r;

		}

drivers/gpu/drm/ttm/ttm_bo.c

+1 −2
Original line number Diff line number Diff line
@@ -327,8 +327,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, 
		ret = ttm_bo_move_ttm(bo, ctx->interruptible,

				      ctx->no_wait_gpu, mem);

	else if (bdev->driver->move)

		ret = bdev->driver->move(bo, evict, ctx->interruptible,

					 ctx->no_wait_gpu, mem);

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

	else

		ret = ttm_bo_move_memcpy(bo, ctx->interruptible,

					 ctx->no_wait_gpu, mem);