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

drm/amdgpu: expand sdma copy_buffer interface with tmz parameter 



This patch expands sdma 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 04379e9b

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

+3 −2
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ struct amdgpu_buffer_funcs { 
				 /* dst addr in bytes */

				 uint64_t dst_offset,

				 /* number of byte to transfer */

				 uint32_t byte_count);

				 uint32_t byte_count,

				 bool tmz);



	/* maximum bytes in a single operation */

	uint32_t	fill_max_bytes;
@@ -107,7 +108,7 @@ struct amdgpu_buffer_funcs { 
				 uint32_t byte_count);

};



#define amdgpu_emit_copy_buffer(adev, ib, s, d, b) (adev)->mman.buffer_funcs->emit_copy_buffer((ib),  (s), (d), (b))

#define amdgpu_emit_copy_buffer(adev, ib, s, d, b, t) (adev)->mman.buffer_funcs->emit_copy_buffer((ib),  (s), (d), (b), (t))

#define amdgpu_emit_fill_buffer(adev, ib, s, d, b) (adev)->mman.buffer_funcs->emit_fill_buffer((ib), (s), (d), (b))



struct amdgpu_sdma_instance *

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

+2 −2
Original line number Diff line number Diff line
@@ -2054,7 +2054,7 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo, 
	dst_addr = amdgpu_bo_gpu_offset(adev->gart.bo);

	dst_addr += window * AMDGPU_GTT_MAX_TRANSFER_SIZE * 8;

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

				dst_addr, num_bytes);

				dst_addr, num_bytes, false);



	amdgpu_ring_pad_ib(ring, &job->ibs[0]);

	WARN_ON(job->ibs[0].length_dw > num_dw);
@@ -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);

					dst_offset, cur_size_in_bytes, false);



		src_offset += cur_size_in_bytes;

		dst_offset += cur_size_in_bytes;

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

+2 −1
Original line number Diff line number Diff line
@@ -1313,7 +1313,8 @@ static void cik_sdma_set_irq_funcs(struct amdgpu_device *adev) 
static void cik_sdma_emit_copy_buffer(struct amdgpu_ib *ib,

				      uint64_t src_offset,

				      uint64_t dst_offset,

				      uint32_t byte_count)

				      uint32_t byte_count,

				      bool tmz)

{

	ib->ptr[ib->length_dw++] = SDMA_PACKET(SDMA_OPCODE_COPY, SDMA_COPY_SUB_OPCODE_LINEAR, 0);

	ib->ptr[ib->length_dw++] = byte_count;

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

+2 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,8 @@ static void sdma_v2_4_set_irq_funcs(struct amdgpu_device *adev) 
static void sdma_v2_4_emit_copy_buffer(struct amdgpu_ib *ib,

				       uint64_t src_offset,

				       uint64_t dst_offset,

				       uint32_t byte_count)

				       uint32_t byte_count,

				       bool tmz)

{

	ib->ptr[ib->length_dw++] = SDMA_PKT_HEADER_OP(SDMA_OP_COPY) |

		SDMA_PKT_HEADER_SUB_OP(SDMA_SUBOP_COPY_LINEAR);

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

+2 −1
Original line number Diff line number Diff line
@@ -1638,7 +1638,8 @@ static void sdma_v3_0_set_irq_funcs(struct amdgpu_device *adev) 
static void sdma_v3_0_emit_copy_buffer(struct amdgpu_ib *ib,

				       uint64_t src_offset,

				       uint64_t dst_offset,

				       uint32_t byte_count)

				       uint32_t byte_count,

				       bool tmz)

{

	ib->ptr[ib->length_dw++] = SDMA_PKT_HEADER_OP(SDMA_OP_COPY) |

		SDMA_PKT_HEADER_SUB_OP(SDMA_SUBOP_COPY_LINEAR);