Commit b13e22ae authored Jun 26, 2015 by Christian König Committed by Alex Deucher Jun 29, 2015

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: Christian König <christian.koenig@amd.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com> (v1)
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 9a5e8fb1

drivers/gpu/drm/radeon/radeon_vm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1122,12 +1122,12 @@ void radeon_vm_bo_rmv(struct radeon_device *rdev,
		interval_tree_remove(&bo_va->it, &vm->va);

		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);
		list_add(&bo_va->vm_status, &vm->freed);
		} else {
		radeon_fence_unref(&bo_va->last_pt_update);
		list_del(&bo_va->vm_status);
		kfree(bo_va);
		}
		spin_unlock(&vm->status_lock);