Attachment 116973 Details for Bug 91141 – Possible fix part 2

Possible fix part 2

0001-drm-radeon-check-if-BO_VA-is-set-before-adding-it-to.patch (text/plain), 1.89 KB, created by Christian König on 2015-07-06 12:31:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2015-07-06 12:31:51 UTC

Size: 1.89 KB

patch

obsolete

>From 5975fab119b518085c7c59f34eff741aa07268f5 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Mon, 6 Jul 2015 14:28:42 +0200
>Subject: [PATCH] drm/radeon: check if BO_VA is set before adding it to the
> invalidation list
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Otherwise we try to clear BO_VAs without an address.
>
>Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>---
> drivers/gpu/drm/radeon/radeon_vm.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
>index 0310965..48d97c0 100644
>--- a/drivers/gpu/drm/radeon/radeon_vm.c
>+++ b/drivers/gpu/drm/radeon/radeon_vm.c
>@@ -507,22 +507,21 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
> 		tmp->bo = radeon_bo_ref(bo_va->bo);
> 
> 		interval_tree_remove(&bo_va->it, &vm->va);
>+		spin_lock(&vm->status_lock);
> 		bo_va->it.start = 0;
> 		bo_va->it.last = 0;
>-
>-		spin_lock(&vm->status_lock);
> 		list_del_init(&bo_va->vm_status);
> 		list_add(&tmp->vm_status, &vm->freed);
> 		spin_unlock(&vm->status_lock);
> 	}
> 
> 	if (soffset || eoffset) {
>+		spin_lock(&vm->status_lock);
> 		bo_va->it.start = soffset;
> 		bo_va->it.last = eoffset - 1;
>-		interval_tree_insert(&bo_va->it, &vm->va);
>-		spin_lock(&vm->status_lock);
> 		list_add(&bo_va->vm_status, &vm->cleared);
> 		spin_unlock(&vm->status_lock);
>+		interval_tree_insert(&bo_va->it, &vm->va);
> 	}
> 
> 	bo_va->flags = flags;
>@@ -1156,7 +1155,8 @@ void radeon_vm_bo_invalidate(struct radeon_device *rdev,
> 
> 	list_for_each_entry(bo_va, &bo->va, bo_list) {
> 		spin_lock(&bo_va->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))
> 			list_add(&bo_va->vm_status, &bo_va->vm->invalidated);
> 		spin_unlock(&bo_va->vm->status_lock);
> 	}
>-- 
>1.9.1
>

Actions: View

Attachments on bug 91141: 116789 | 116790 | 116918 | 116924 | 116933 | 116936 | 116973

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.