leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: choose number of VM levels based on VM size

Browse Source 
This allows us limiting the VM size for testing even of Vega10.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2017-11-23 11:16:05 +01:00 committed by Alex Deucher
parent b38f41ebb8
commit 36539dcea3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
View File

@ -2582,12 +2582,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, void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,
uint32_t fragment_size_default, unsigned max_level) uint32_t fragment_size_default, unsigned max_level)
{ {
/* adjust vm size first, but only for two level setups for now */ uint64_t tmp;
if (amdgpu_vm_size != -1 && max_level == 1)
/* adjust vm size first */
if (amdgpu_vm_size != -1)
vm_size = amdgpu_vm_size; vm_size = amdgpu_vm_size;
adev->vm_manager.max_pfn = (uint64_t)vm_size << 18; 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*/ /* block size depends on vm size and hw setup*/
if (adev->vm_manager.num_level > 1) if (adev->vm_manager.num_level > 1)
@ -2604,8 +2609,9 @@ void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,
else else
adev->vm_manager.fragment_size = amdgpu_vm_fragment_size; 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", 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.block_size, vm_size, adev->vm_manager.num_level + 1,
adev->vm_manager.block_size,
adev->vm_manager.fragment_size); adev->vm_manager.fragment_size);
} }