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

drm/radeon: fix adding all VAs to the freed list on remove v2

We only should do so when the BO_VA was actually mapped.
Otherwise we get a nice error message on the next CS.

v2: It actually doesn't matter if it was invalidated or not,
    if it was mapped we need to clear the area where it was mapped.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com> (v1)
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9a5e8fb1
...@@ -1122,12 +1122,12 @@ void radeon_vm_bo_rmv(struct radeon_device *rdev, ...@@ -1122,12 +1122,12 @@ void radeon_vm_bo_rmv(struct radeon_device *rdev,
interval_tree_remove(&bo_va->it, &vm->va); interval_tree_remove(&bo_va->it, &vm->va);
spin_lock(&vm->status_lock); spin_lock(&vm->status_lock);
if (list_empty(&bo_va->vm_status)) { list_del(&bo_va->vm_status);
if (bo_va->it.start || bo_va->it.last) {
bo_va->bo = radeon_bo_ref(bo_va->bo); bo_va->bo = radeon_bo_ref(bo_va->bo);
list_add(&bo_va->vm_status, &vm->freed); list_add(&bo_va->vm_status, &vm->freed);
} else { } else {
radeon_fence_unref(&bo_va->last_pt_update); radeon_fence_unref(&bo_va->last_pt_update);
list_del(&bo_va->vm_status);
kfree(bo_va); kfree(bo_va);
} }
spin_unlock(&vm->status_lock); spin_unlock(&vm->status_lock);
......
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