From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:49623 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752083AbbEJU6U (ORCPT ); Sun, 10 May 2015 16:58:20 -0400 Subject: Patch "drm/radeon: fix lockup when BOs aren't part of the VM on release" has been added to the 4.0-stable tree To: christian.koenig@amd.com, alexander.deucher@amd.com, gregkh@linuxfoundation.org Cc: , From: Date: Sun, 10 May 2015 14:32:15 +0200 Message-ID: <1431261135232239@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 26d4d129b6042197b4cbc8341c0618f99231af2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= 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?= 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. Signed-off-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/radeon/radeon_vm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/radeon/radeon_vm.c +++ b/drivers/gpu/drm/radeon/radeon_vm.c @@ -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 christian.koenig@amd.com 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