From: Alex Deucher Date: Tue, 17 Sep 2019 13:11:24 +0000 (-0500) Subject: drm/amdgpu/ras: use GPU PAGE_SIZE/SHIFT for reserving pages X-Git-Tag: v5.5-rc1~128^2~26^2~153 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a142ba8800dd12de1a9013477efa8ab692041ed3;p=linux.git drm/amdgpu/ras: use GPU PAGE_SIZE/SHIFT for reserving pages We are reserving vram pages so they should be aligned to the GPU page size. Reviewed-by: Tao Zhou Reviewed-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index a36df02b61ea..24fecaae415c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -1416,7 +1416,8 @@ int amdgpu_ras_reserve_bad_pages(struct amdgpu_device *adev) * 2) a ras bad page has been reserved (duplicate error injection * for one page); */ - if (amdgpu_bo_create_kernel_at(adev, bp << PAGE_SHIFT, PAGE_SIZE, + if (amdgpu_bo_create_kernel_at(adev, bp << AMDGPU_GPU_PAGE_SHIFT, + AMDGPU_GPU_PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM, &bo, NULL)) DRM_WARN("RAS WARN: reserve vram for retired page %llx fail\n", bp);