Commit 53e2e91d authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: cache the complete pde

Makes it easier to update the PDE with huge pages.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bb37b67d
...@@ -985,6 +985,7 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev, ...@@ -985,6 +985,7 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev,
} }
pt = amdgpu_bo_gpu_offset(bo); pt = amdgpu_bo_gpu_offset(bo);
pt = amdgpu_gart_get_vm_pde(adev, pt);
if (parent->entries[pt_idx].addr == pt) if (parent->entries[pt_idx].addr == pt)
continue; continue;
...@@ -996,18 +997,15 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev, ...@@ -996,18 +997,15 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev,
(count == AMDGPU_VM_MAX_UPDATE_SIZE)) { (count == AMDGPU_VM_MAX_UPDATE_SIZE)) {
if (count) { if (count) {
uint64_t entry;
entry = amdgpu_gart_get_vm_pde(adev, last_pt);
if (shadow) if (shadow)
amdgpu_vm_do_set_ptes(&params, amdgpu_vm_do_set_ptes(&params,
last_shadow, last_shadow,
entry, count, last_pt, count,
incr, incr,
AMDGPU_PTE_VALID); AMDGPU_PTE_VALID);
amdgpu_vm_do_set_ptes(&params, last_pde, amdgpu_vm_do_set_ptes(&params, last_pde,
entry, count, incr, last_pt, count, incr,
AMDGPU_PTE_VALID); AMDGPU_PTE_VALID);
} }
...@@ -1021,15 +1019,11 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev, ...@@ -1021,15 +1019,11 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev,
} }
if (count) { if (count) {
uint64_t entry;
entry = amdgpu_gart_get_vm_pde(adev, last_pt);
if (vm->root.bo->shadow) if (vm->root.bo->shadow)
amdgpu_vm_do_set_ptes(&params, last_shadow, entry, amdgpu_vm_do_set_ptes(&params, last_shadow, last_pt,
count, incr, AMDGPU_PTE_VALID); count, incr, AMDGPU_PTE_VALID);
amdgpu_vm_do_set_ptes(&params, last_pde, entry, amdgpu_vm_do_set_ptes(&params, last_pde, last_pt,
count, incr, AMDGPU_PTE_VALID); count, incr, AMDGPU_PTE_VALID);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment