[PATCH] drm/radeon: fix adding all VAs to the freed list on remove

Christian König deathsimple at vodafone.de
Fri Jun 26 01:41:28 PDT 2015


From: Christian König <christian.koenig at amd.com>

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

Signed-off-by: Christian König <christian.koenig at amd.com>
---
 drivers/gpu/drm/radeon/radeon_vm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 3662157..53d57d9 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -1129,7 +1129,8 @@ 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)) {
+	if (list_empty(&bo_va->vm_status) &&
+	    (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 {
-- 
1.9.1



More information about the dri-devel mailing list