diff mbox

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

Message ID 1435308088-1988-1-git-send-email-deathsimple@vodafone.de (mailing list archive)
State New, archived
Headers show

Commit Message

Christian König June 26, 2015, 8:41 a.m. UTC 
From: Christian König <christian.koenig@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@amd.com>
---
 drivers/gpu/drm/radeon/radeon_vm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Michel Dänzer June 26, 2015, 9:36 a.m. UTC | #1 
On 26.06.2015 17:41, Christian König wrote:
> From: Christian König <christian.koenig@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@amd.com>

Tested-by: Michel Dänzer <michel.daenzer@amd.com>
diff mbox

Patch

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 {