From 43402c9acb4f14c7cd3eb225e126ddc57b37a09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Thu, 23 Nov 2017 11:16:05 +0100 Subject: [PATCH 2795/4131] drm/amdgpu: choose number of VM levels based on VM size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows us limiting the VM size for testing even of Vega10. Signed-off-by: Christian König Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index a58937b..1b13d997 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -2619,12 +2619,17 @@ static uint32_t amdgpu_vm_get_block_size(uint64_t vm_size) void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size, uint32_t fragment_size_default, unsigned max_level) { - /* adjust vm size first, but only for two level setups for now */ - if (amdgpu_vm_size != -1 && max_level == 1) + uint64_t tmp; + + /* adjust vm size first */ + if (amdgpu_vm_size != -1) vm_size = amdgpu_vm_size; adev->vm_manager.max_pfn = (uint64_t)vm_size << 18; - adev->vm_manager.num_level = max_level; + + tmp = roundup_pow_of_two(adev->vm_manager.max_pfn); + tmp = DIV_ROUND_UP(fls64(tmp) - 1, 9) - 1; + adev->vm_manager.num_level = min(max_level, (unsigned)tmp); /* block size depends on vm size and hw setup*/ if (adev->vm_manager.num_level > 1) @@ -2641,8 +2646,9 @@ void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size, else adev->vm_manager.fragment_size = amdgpu_vm_fragment_size; - DRM_INFO("vm size is %u GB, block size is %u-bit, fragment size is %u-bit\n", - vm_size, adev->vm_manager.block_size, + DRM_INFO("vm size is %u GB, %u levels, block size is %u-bit, fragment size is %u-bit\n", + vm_size, adev->vm_manager.num_level + 1, + adev->vm_manager.block_size, adev->vm_manager.fragment_size); } -- 2.7.4