Commit 4e930d96 authored by Luben Tuikov's avatar Luben Tuikov Committed by Alex Deucher
Browse files

drm/amdgpu: Use the ALIGN() macro 



Use the ALIGN() macro to set "num_dw" to a
multiple of 8, i.e. lower 3 bits cleared.

Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 54e9ab2e

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

+2 −9
Original line number Diff line number Diff line
@@ -1921,10 +1921,7 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo, 
	*addr += (u64)window * AMDGPU_GTT_MAX_TRANSFER_SIZE *

		AMDGPU_GPU_PAGE_SIZE;



	num_dw = adev->mman.buffer_funcs->copy_num_dw;

	while (num_dw & 0x7)

		num_dw++;



	num_dw = ALIGN(adev->mman.buffer_funcs->copy_num_dw, 8);

	num_bytes = num_pages * 8;



	r = amdgpu_job_alloc_with_ib(adev, num_dw * 4 + num_bytes, &job);
@@ -1984,11 +1981,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, 


	max_bytes = adev->mman.buffer_funcs->copy_max_bytes;

	num_loops = DIV_ROUND_UP(byte_count, max_bytes);

	num_dw = num_loops * adev->mman.buffer_funcs->copy_num_dw;



	/* for IB padding */

	while (num_dw & 0x7)

		num_dw++;

	num_dw = ALIGN(num_loops * adev->mman.buffer_funcs->copy_num_dw, 8);



	r = amdgpu_job_alloc_with_ib(adev, num_dw * 4, &job);

	if (r)

CRA Git | Maintained and supported by SUSTech CRA and CCSE