drm/amdgpu: split VM PD and PT handling during CS
This way we avoid the extra allocation for the page directory entry.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9591c13..3fb21ec 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -387,8 +387,7 @@
}
INIT_LIST_HEAD(&duplicates);
- p->vm_bos = amdgpu_vm_get_bos(p->adev, &fpriv->vm,
- &p->validated, &duplicates);
+ amdgpu_vm_get_pd_bo(&fpriv->vm, &p->validated, &p->vm_pd);
if (need_mmap_lock)
down_read(¤t->mm->mmap_sem);
@@ -397,6 +396,12 @@
if (unlikely(r != 0))
goto error_reserve;
+ p->vm_bos = amdgpu_vm_get_pt_bos(&fpriv->vm, &duplicates);
+ if (!p->vm_bos) {
+ r = -ENOMEM;
+ goto error_validate;
+ }
+
r = amdgpu_cs_list_validate(p->adev, &fpriv->vm, &p->validated);
if (r)
goto error_validate;