Commit c9dc9cfe authored by Aaron Liu's avatar Aaron Liu Committed by Alex Deucher
Browse files

drm/amdgpu: expand amdgpu_copy_buffer interface with tmz parameter 



This patch expands amdgpu_copy_buffer interface with tmz parameter.

Signed-off-by: default avatarAaron Liu <aaron.liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent be7538ff

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static int amdgpu_benchmark_do_move(struct amdgpu_device *adev, unsigned size, 
	for (i = 0; i < n; i++) {

		struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring;

		r = amdgpu_copy_buffer(ring, saddr, daddr, size, NULL, &fence,

				       false, false);

				       false, false, false);

		if (r)

			goto exit_do_move;

		r = dma_fence_wait(fence, false);

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

+1 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ int amdgpu_bo_restore_shadow(struct amdgpu_bo *shadow, struct dma_fence **fence) 


	return amdgpu_copy_buffer(ring, shadow_addr, parent_addr,

				  amdgpu_bo_size(shadow), NULL, fence,

				  true, false);

				  true, false, false);

}



/**

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

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) 
		amdgpu_bo_kunmap(gtt_obj[i]);



		r = amdgpu_copy_buffer(ring, gart_addr, vram_addr,

				       size, NULL, &fence, false, false);

				       size, NULL, &fence, false, false, false);



		if (r) {

			DRM_ERROR("Failed GTT->VRAM copy %d\n", i);
@@ -170,7 +170,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) 
		amdgpu_bo_kunmap(vram_obj);



		r = amdgpu_copy_buffer(ring, vram_addr, gart_addr,

				       size, NULL, &fence, false, false);

				       size, NULL, &fence, false, false, false);



		if (r) {

			DRM_ERROR("Failed VRAM->GTT copy %d\n", i);

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

+3 −3
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev, 
		}



		r = amdgpu_copy_buffer(ring, from, to, cur_size,

				       resv, &next, false, true);

				       resv, &next, false, true, false);

		if (r)

			goto error;
@@ -2084,7 +2084,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, 
		       uint64_t dst_offset, uint32_t byte_count,

		       struct dma_resv *resv,

		       struct dma_fence **fence, bool direct_submit,

		       bool vm_needs_flush)

		       bool vm_needs_flush, bool tmz)

{

	struct amdgpu_device *adev = ring->adev;

	struct amdgpu_job *job;
@@ -2126,7 +2126,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, 
		uint32_t cur_size_in_bytes = min(byte_count, max_bytes);



		amdgpu_emit_copy_buffer(adev, &job->ibs[0], src_offset,

					dst_offset, cur_size_in_bytes, false);

					dst_offset, cur_size_in_bytes, tmz);



		src_offset += cur_size_in_bytes;

		dst_offset += cur_size_in_bytes;

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

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, 
		       uint64_t dst_offset, uint32_t byte_count,

		       struct dma_resv *resv,

		       struct dma_fence **fence, bool direct_submit,

		       bool vm_needs_flush);

		       bool vm_needs_flush, bool tmz);

int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev,

			       struct amdgpu_copy_mem *src,

			       struct amdgpu_copy_mem *dst,