aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-01-16 09:35:10 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-01-16 15:35:27 -0500
commit83fbb788a49c11477d42ca323cf16c109d426d70 (patch)
tree7b8a409de25a706c55253a50e7428e09f4195ea7 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
parent4c63abb203db9cf23c746dcbcc64883e08977776 (diff)
drm/amdgpu: fix CPU based VM updates
That got accidentially removed. 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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 9e266307ce63..6fc16eecf2dc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -970,12 +970,16 @@ static void amdgpu_vm_handle_huge_pages(struct amdgpu_pte_update_params *p,
970 amdgpu_gart_get_vm_pde(p->adev, AMDGPU_VM_PDB0, 970 amdgpu_gart_get_vm_pde(p->adev, AMDGPU_VM_PDB0,
971 &dst, &flags); 971 &dst, &flags);
972 972
973 if (parent->base.bo->shadow) { 973 if (p->func == amdgpu_vm_cpu_set_ptes) {
974 pd_addr = amdgpu_bo_gpu_offset(parent->base.bo->shadow); 974 pd_addr = (unsigned long)amdgpu_bo_kptr(parent->base.bo);
975 pde = pd_addr + (entry - parent->entries) * 8; 975 } else {
976 p->func(p, pde, dst, 1, 0, flags); 976 if (parent->base.bo->shadow) {
977 pd_addr = amdgpu_bo_gpu_offset(parent->base.bo->shadow);
978 pde = pd_addr + (entry - parent->entries) * 8;
979 p->func(p, pde, dst, 1, 0, flags);
980 }
981 pd_addr = amdgpu_bo_gpu_offset(parent->base.bo);
977 } 982 }
978 pd_addr = amdgpu_bo_gpu_offset(parent->base.bo);
979 pde = pd_addr + (entry - parent->entries) * 8; 983 pde = pd_addr + (entry - parent->entries) * 8;
980 p->func(p, pde, dst, 1, 0, flags); 984 p->func(p, pde, dst, 1, 0, flags);
981} 985}