Commit d5375156 authored by Yi Li's avatar Yi Li Committed by Alex Deucher
Browse files

drm/amdgpu: Fix GPU TLB update error when PAGE_SIZE > AMDGPU_PAGE_SIZE 



When PAGE_SIZE is larger than AMDGPU_PAGE_SIZE, the number of GPU TLB
entries which need to update in amdgpu_map_buffer() should be multiplied
by AMDGPU_GPU_PAGES_IN_CPU_PAGE (PAGE_SIZE / AMDGPU_PAGE_SIZE).

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarYi Li <liyi@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 0c8df343

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

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_object *bo, 
	*addr += mm_cur->start & ~PAGE_MASK;



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

	num_bytes = num_pages * 8;

	num_bytes = num_pages * 8 * AMDGPU_GPU_PAGES_IN_CPU_PAGE;



	r = amdgpu_job_alloc_with_ib(adev, num_dw * 4 + num_bytes,

				     AMDGPU_IB_POOL_DELAYED, &job);