mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 07:13:34 +00:00
Revert "drm/amdgpu: Add table_freed parameter to amdgpu_vm_bo_update"
This reverts commit 075e8080c1
.
Reason for revert: the related commit is reverted.
Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
c37387c354
commit
d605094394
4 changed files with 10 additions and 10 deletions
|
@ -781,7 +781,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false, NULL);
|
r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false);
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
|
@ -792,7 +792,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
|
||||||
if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {
|
if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {
|
||||||
bo_va = fpriv->csa_va;
|
bo_va = fpriv->csa_va;
|
||||||
BUG_ON(!bo_va);
|
BUG_ON(!bo_va);
|
||||||
r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);
|
r = amdgpu_vm_bo_update(adev, bo_va, false);
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
|
@ -811,7 +811,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
|
||||||
if (bo_va == NULL)
|
if (bo_va == NULL)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);
|
r = amdgpu_vm_bo_update(adev, bo_va, false);
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
|
|
|
@ -612,7 +612,7 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev,
|
||||||
|
|
||||||
if (operation == AMDGPU_VA_OP_MAP ||
|
if (operation == AMDGPU_VA_OP_MAP ||
|
||||||
operation == AMDGPU_VA_OP_REPLACE) {
|
operation == AMDGPU_VA_OP_REPLACE) {
|
||||||
r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);
|
r = amdgpu_vm_bo_update(adev, bo_va, false);
|
||||||
if (r)
|
if (r)
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1758,7 +1758,7 @@ int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
|
||||||
r = vm->update_funcs->commit(¶ms, fence);
|
r = vm->update_funcs->commit(¶ms, fence);
|
||||||
|
|
||||||
if (table_freed)
|
if (table_freed)
|
||||||
*table_freed = *table_freed || params.table_freed;
|
*table_freed = params.table_freed;
|
||||||
|
|
||||||
error_unlock:
|
error_unlock:
|
||||||
amdgpu_vm_eviction_unlock(vm);
|
amdgpu_vm_eviction_unlock(vm);
|
||||||
|
@ -1823,7 +1823,7 @@ void amdgpu_vm_get_memory(struct amdgpu_vm *vm, uint64_t *vram_mem,
|
||||||
* 0 for success, -EINVAL for failure.
|
* 0 for success, -EINVAL for failure.
|
||||||
*/
|
*/
|
||||||
int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va,
|
int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va,
|
||||||
bool clear, bool *table_freed)
|
bool clear)
|
||||||
{
|
{
|
||||||
struct amdgpu_bo *bo = bo_va->base.bo;
|
struct amdgpu_bo *bo = bo_va->base.bo;
|
||||||
struct amdgpu_vm *vm = bo_va->base.vm;
|
struct amdgpu_vm *vm = bo_va->base.vm;
|
||||||
|
@ -1902,7 +1902,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va,
|
||||||
resv, mapping->start,
|
resv, mapping->start,
|
||||||
mapping->last, update_flags,
|
mapping->last, update_flags,
|
||||||
mapping->offset, mem,
|
mapping->offset, mem,
|
||||||
pages_addr, last_update, table_freed);
|
pages_addr, last_update, NULL);
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
@ -2154,7 +2154,7 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev,
|
||||||
|
|
||||||
list_for_each_entry_safe(bo_va, tmp, &vm->moved, base.vm_status) {
|
list_for_each_entry_safe(bo_va, tmp, &vm->moved, base.vm_status) {
|
||||||
/* Per VM BOs never need to bo cleared in the page tables */
|
/* Per VM BOs never need to bo cleared in the page tables */
|
||||||
r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);
|
r = amdgpu_vm_bo_update(adev, bo_va, false);
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
@ -2173,7 +2173,7 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev,
|
||||||
else
|
else
|
||||||
clear = true;
|
clear = true;
|
||||||
|
|
||||||
r = amdgpu_vm_bo_update(adev, bo_va, clear, NULL);
|
r = amdgpu_vm_bo_update(adev, bo_va, clear);
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
|
|
|
@ -406,7 +406,7 @@ int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
|
||||||
struct dma_fence **fence, bool *free_table);
|
struct dma_fence **fence, bool *free_table);
|
||||||
int amdgpu_vm_bo_update(struct amdgpu_device *adev,
|
int amdgpu_vm_bo_update(struct amdgpu_device *adev,
|
||||||
struct amdgpu_bo_va *bo_va,
|
struct amdgpu_bo_va *bo_va,
|
||||||
bool clear, bool *table_freed);
|
bool clear);
|
||||||
bool amdgpu_vm_evictable(struct amdgpu_bo *bo);
|
bool amdgpu_vm_evictable(struct amdgpu_bo *bo);
|
||||||
void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev,
|
void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev,
|
||||||
struct amdgpu_bo *bo, bool evicted);
|
struct amdgpu_bo *bo, bool evicted);
|
||||||
|
|
Loading…
Reference in a new issue