bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-04 22:43:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: unify VM size handling of Vega10 with older generation

Browse Source 
One function to rule them all.

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-22 17:00:35 +01:00
committed by Alex Deucher
parent 0410c5e514
commit b38f41ebb8
6 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2573,21 +2573,6 @@ static uint32_t amdgpu_vm_get_block_size(uint64_t vm_size)
return ((bits + 3) / 2);
}
/**
* amdgpu_vm_set_fragment_size - adjust fragment size in PTE
*
* @adev: amdgpu_device pointer
* @fragment_size_default: the default fragment size if it's set auto
*/
void amdgpu_vm_set_fragment_size(struct amdgpu_device *adev,
uint32_t fragment_size_default)
{
if (amdgpu_vm_fragment_size == -1)
adev->vm_manager.fragment_size = fragment_size_default;
else
adev->vm_manager.fragment_size = amdgpu_vm_fragment_size;
}
/**
* amdgpu_vm_adjust_size - adjust vm size, block size and fragment size
*
@@ -2595,22 +2580,29 @@ void amdgpu_vm_set_fragment_size(struct amdgpu_device *adev,
* @vm_size: the default vm size if it's set auto
*/
void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,
uint32_t fragment_size_default)
uint32_t fragment_size_default, unsigned max_level)
{
/* adjust vm size firstly */
if (amdgpu_vm_size != -1)
/* adjust vm size first, but only for two level setups for now */
if (amdgpu_vm_size != -1 && max_level == 1)
vm_size = amdgpu_vm_size;
adev->vm_manager.max_pfn = (uint64_t)vm_size << 18;
adev->vm_manager.num_level = max_level;
/* block size depends on vm size */
if (amdgpu_vm_block_size == -1)
/* block size depends on vm size and hw setup*/
if (adev->vm_manager.num_level > 1)
/* Use fixed block_size for multi level page tables */
adev->vm_manager.block_size = 9;
else if (amdgpu_vm_block_size == -1)
adev->vm_manager.block_size =
amdgpu_vm_get_block_size(vm_size);
else
adev->vm_manager.block_size = amdgpu_vm_block_size;
amdgpu_vm_set_fragment_size(adev, fragment_size_default);
if (amdgpu_vm_fragment_size == -1)
adev->vm_manager.fragment_size = fragment_size_default;
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,