Skip to content

Commit 3b948dd

Browse files
amd-yangpalexdeucher
authored andcommitted
drm/amdgpu: Use 5-level paging if gmc support 57-bit VA
Regardless if CPU enable 5-level paging, GPU vm use 5-level paging if gmc init with 57-bit address space support, because ARM64 4-level paging support 48-bit VA, x86 and GPU 4-level paging support 47-bit VA, require 5-level paging on GPU to support ARM64. NPA address space 52-bit mapping on NPA GPU VM require 5-level paging. Debugger trap get device snapshot expect LDS and Scratch base, limit above 57-bit, which is set only for 5-level paging. Signed-off-by: Philip Yang <Philip.Yang@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org # 6.19.x
1 parent ff205dc commit 3b948dd

1 file changed

Lines changed: 0 additions & 17 deletions

File tree

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2360,26 +2360,9 @@ void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size,
23602360
unsigned max_bits)
23612361
{
23622362
unsigned int max_size = 1 << (max_bits - 30);
2363-
bool sys_5level_pgtable = false;
23642363
unsigned int vm_size;
23652364
uint64_t tmp;
23662365

2367-
#ifdef CONFIG_X86_64
2368-
/*
2369-
* Refer to function configure_5level_paging() for details.
2370-
*/
2371-
sys_5level_pgtable = (native_read_cr4() & X86_CR4_LA57);
2372-
#endif
2373-
2374-
/*
2375-
* If GPU supports 5-level page table, but system uses 4-level page table,
2376-
* then use 4-level page table on GPU
2377-
*/
2378-
if (max_level == 4 && !sys_5level_pgtable) {
2379-
min_vm_size = 256 * 1024;
2380-
max_level = 3;
2381-
}
2382-
23832366
/* adjust vm size first */
23842367
if (amdgpu_vm_size != -1) {
23852368
vm_size = amdgpu_vm_size;

0 commit comments

Comments
 (0)