Commit ea9238a8 authored by Frank Min's avatar Frank Min Committed by Alex Deucher
Browse files

drm/amdgpu: replace tmz flag into buffer flag 



Replace tmz flag into buffer flag to make it easier to understand
and extend

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Signed-off-by: default avatarFrank Min <Frank.Min@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 92ed1e9c

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

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,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, 0);

		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
@@ -765,7 +765,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, false);

				  true, false, 0);

}



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ struct amdgpu_buffer_funcs { 
				 uint64_t dst_offset,

				 /* number of byte to transfer */

				 uint32_t byte_count,

				 bool tmz);

				 uint32_t copy_flags);



	/* maximum bytes in a single operation */

	uint32_t	fill_max_bytes;

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

+11 −7
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int amdgpu_ttm_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, false);

				dst_addr, num_bytes, 0);



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

	WARN_ON(job->ibs[0].length_dw > num_dw);
@@ -296,6 +296,8 @@ int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev, 
	struct dma_fence *fence = NULL;

	int r = 0;



	uint32_t copy_flags = 0;



	if (!adev->mman.buffer_funcs_enabled) {

		DRM_ERROR("Trying to move memory with ring turned off.\n");

		return -EINVAL;
@@ -323,8 +325,11 @@ int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev, 
		if (r)

			goto error;



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

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

		if (tmz)

			copy_flags |= AMDGPU_COPY_FLAGS_TMZ;



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

				       &next, false, true, copy_flags);

		if (r)

			goto error;
@@ -1488,7 +1493,7 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo, 
		swap(src_addr, dst_addr);



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

				PAGE_SIZE, false);

				PAGE_SIZE, 0);



	amdgpu_ring_pad_ib(adev->mman.buffer_funcs_ring, &job->ibs[0]);

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

		       bool vm_needs_flush, uint32_t copy_flags)

{

	struct amdgpu_device *adev = ring->adev;

	unsigned int num_loops, num_dw;
@@ -2165,8 +2170,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, tmz);



					dst_offset, cur_size_in_bytes, copy_flags);

		src_offset += cur_size_in_bytes;

		dst_offset += cur_size_in_bytes;

		byte_count -= cur_size_in_bytes;

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

+3 −1
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ struct amdgpu_copy_mem { 
	unsigned long			offset;

};



#define AMDGPU_COPY_FLAGS_TMZ		(1 << 0)



int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size);

void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev);

int amdgpu_preempt_mgr_init(struct amdgpu_device *adev);
@@ -151,7 +153,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 tmz);

		       bool vm_needs_flush, uint32_t copy_flags);

int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev,

			       const struct amdgpu_copy_mem *src,

			       const struct amdgpu_copy_mem *dst,