Attachment 116933 Details for Bug 91141 – Possible fix

[patch] Possible fix

0001-drm-radeon-allways-add-the-VM-clear-duplicate.patch (text/plain), 2.14 KB, created by Christian König on 2015-07-03 18:49:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2015-07-03 18:49:44 UTC

Size: 2.14 KB

patch

obsolete

>From 21a46f677a4d9fbbe4584bd773462323a6f66409 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Fri, 3 Jul 2015 20:48:02 +0200
>Subject: [PATCH] drm/radeon: allways add the VM clear duplicate
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>We need to allways add the VM clear duplicate of the BO_VA,
>not matter what the old status was.
>
>Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>---
> drivers/gpu/drm/radeon/radeon_vm.c | 34 ++++++++++++++++------------------
> 1 file changed, 16 insertions(+), 18 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
>index ec10533..0310965 100644
>--- a/drivers/gpu/drm/radeon/radeon_vm.c
>+++ b/drivers/gpu/drm/radeon/radeon_vm.c
>@@ -493,29 +493,27 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
> 	}
> 
> 	if (bo_va->it.start || bo_va->it.last) {
>-		spin_lock(&vm->status_lock);
>-		if (list_empty(&bo_va->vm_status)) {
>-			/* add a clone of the bo_va to clear the old address */
>-			struct radeon_bo_va *tmp;
>-			spin_unlock(&vm->status_lock);
>-			tmp = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL);
>-			if (!tmp) {
>-				mutex_unlock(&vm->mutex);
>-				r = -ENOMEM;
>-				goto error_unreserve;
>-			}
>-			tmp->it.start = bo_va->it.start;
>-			tmp->it.last = bo_va->it.last;
>-			tmp->vm = vm;
>-			tmp->bo = radeon_bo_ref(bo_va->bo);
>-			spin_lock(&vm->status_lock);
>-			list_add(&tmp->vm_status, &vm->freed);
>+		/* add a clone of the bo_va to clear the old address */
>+		struct radeon_bo_va *tmp;
>+		tmp = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL);
>+		if (!tmp) {
>+			mutex_unlock(&vm->mutex);
>+			r = -ENOMEM;
>+			goto error_unreserve;
> 		}
>-		spin_unlock(&vm->status_lock);
>+		tmp->it.start = bo_va->it.start;
>+		tmp->it.last = bo_va->it.last;
>+		tmp->vm = vm;
>+		tmp->bo = radeon_bo_ref(bo_va->bo);
> 
> 		interval_tree_remove(&bo_va->it, &vm->va);
> 		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) {
>-- 
>1.9.1
>

Actions: View | Splinter Review

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.