Commit 46cf5f76 authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: make sure to never allocate PDs/PTs for invalidations

Make sure that we never allocate a page table for an invalidation operation.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 55cdd4e9
...@@ -1442,15 +1442,15 @@ static int amdgpu_vm_update_ptes(struct amdgpu_vm_update_params *params, ...@@ -1442,15 +1442,15 @@ static int amdgpu_vm_update_ptes(struct amdgpu_vm_update_params *params,
uint64_t incr, entry_end, pe_start; uint64_t incr, entry_end, pe_start;
struct amdgpu_bo *pt; struct amdgpu_bo *pt;
/* make sure that the page tables covering the address range are if (flags & AMDGPU_PTE_VALID) {
* actually allocated /* make sure that the page tables covering the
*/ * address range are actually allocated
r = amdgpu_vm_alloc_pts(params->adev, params->vm, &cursor, */
params->direct); r = amdgpu_vm_alloc_pts(params->adev, params->vm,
if (r) &cursor, params->direct);
return r; if (r)
return r;
pt = cursor.entry->base.bo; }
shift = amdgpu_vm_level_shift(adev, cursor.level); shift = amdgpu_vm_level_shift(adev, cursor.level);
parent_shift = amdgpu_vm_level_shift(adev, cursor.level - 1); parent_shift = amdgpu_vm_level_shift(adev, cursor.level - 1);
...@@ -1479,6 +1479,10 @@ static int amdgpu_vm_update_ptes(struct amdgpu_vm_update_params *params, ...@@ -1479,6 +1479,10 @@ static int amdgpu_vm_update_ptes(struct amdgpu_vm_update_params *params,
continue; continue;
} }
pt = cursor.entry->base.bo;
if (!pt)
return -ENOENT;
/* Looks good so far, calculate parameters for the update */ /* Looks good so far, calculate parameters for the update */
incr = (uint64_t)AMDGPU_GPU_PAGE_SIZE << shift; incr = (uint64_t)AMDGPU_GPU_PAGE_SIZE << shift;
mask = amdgpu_vm_entries_mask(adev, cursor.level); mask = amdgpu_vm_entries_mask(adev, cursor.level);
......
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