diff options
author | Christian König <christian.koenig@amd.com> | 2017-03-13 05:13:37 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-03-29 23:54:00 -0400 |
commit | 663e4577a5733fab18d601128f54486d78595bc0 (patch) | |
tree | af0a0b2121dea7755bcb0b1bbde9af53f986db18 /drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | |
parent | 4388fc2ab0e83fd6247c48c7e97064cc75511848 (diff) |
drm/amdgpu: separate page table allocation from mapping
This makes it easier to implement a replace operation.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c index 2feb9aa3b1f4..ecef35a1fe33 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | |||
@@ -75,6 +75,15 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm) | |||
75 | return -ENOMEM; | 75 | return -ENOMEM; |
76 | } | 76 | } |
77 | 77 | ||
78 | r = amdgpu_vm_alloc_pts(adev, bo_va->vm, AMDGPU_CSA_VADDR, | ||
79 | AMDGPU_CSA_SIZE); | ||
80 | if (r) { | ||
81 | DRM_ERROR("failed to allocate pts for static CSA, err=%d\n", r); | ||
82 | amdgpu_vm_bo_rmv(adev, bo_va); | ||
83 | ttm_eu_backoff_reservation(&ticket, &list); | ||
84 | return r; | ||
85 | } | ||
86 | |||
78 | r = amdgpu_vm_bo_map(adev, bo_va, AMDGPU_CSA_VADDR, 0,AMDGPU_CSA_SIZE, | 87 | r = amdgpu_vm_bo_map(adev, bo_va, AMDGPU_CSA_VADDR, 0,AMDGPU_CSA_SIZE, |
79 | AMDGPU_PTE_READABLE | AMDGPU_PTE_WRITEABLE | | 88 | AMDGPU_PTE_READABLE | AMDGPU_PTE_WRITEABLE | |
80 | AMDGPU_PTE_EXECUTABLE); | 89 | AMDGPU_PTE_EXECUTABLE); |