Skip to contentSkip to conversation

Patch "drm/radeon: fix lockup when BOs aren't part of the VM on release" has been added to the 4.0-stable tree

PATCH [email protected] 1 participant 1 message May 10, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/radeon: fix lockup when BOs aren't part of the VM on release

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-radeon-fix-lockup-when-bos-aren-t-part-of-the-vm-on-release.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 26d4d129b6042197b4cbc8341c0618f99231af2f Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]>
Date: Mon, 27 Apr 2015 17:04:34 +0200
Subject: drm/radeon: fix lockup when BOs aren't part of the VM on release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: =?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]>

commit 26d4d129b6042197b4cbc8341c0618f99231af2f upstream.

If we unmap BOs before releasing them them the intervall tree locks up because we try to remove an entry not inside the tree.

Based on a patch from Michel Dänzer.

---
 drivers/gpu/drm/radeon/radeon_vm.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_vm.c +2 -1
@@ -1107,7 +1107,8 @@ void radeon_vm_bo_rmv(struct radeon_devi
 	list_del(&bo_va->bo_list);
 
 	mutex_lock(&vm->mutex);
-	interval_tree_remove(&bo_va->it, &vm->va);
+	if (bo_va->it.start || bo_va->it.last)
+		interval_tree_remove(&bo_va->it, &vm->va);
 	spin_lock(&vm->status_lock);
 	list_del(&bo_va->vm_status);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/drm-radeon-fix-lockup-when-bos-aren-t-part-of-the-vm-on-release.patch queue-4.0/drm-radeon-reset-bos-address-after-clearing-it.patch queue-4.0/drm-radeon-check-new-address-before-removing-old-one.patch queue-4.0/drm-radeon-use-drm_calloc_ab-for-cs-relocs.patch