aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2012-06-01 15:39:11 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-10 00:33:02 +0900
commit166ab4d1f2a1fae8f2cbe43da0e35befadc1e90b (patch)
tree373d9b385e3b49aa2879a1a30b014ccd119833ec /drivers/gpu
parentdf1dadab46b1a1deec017dc4bb20c6325f6fbd23 (diff)
downloadkernel_samsung_smdk4412-166ab4d1f2a1fae8f2cbe43da0e35befadc1e90b.zip
kernel_samsung_smdk4412-166ab4d1f2a1fae8f2cbe43da0e35befadc1e90b.tar.gz
kernel_samsung_smdk4412-166ab4d1f2a1fae8f2cbe43da0e35befadc1e90b.tar.bz2
drm/ttm: Fix spinlock imbalance
commit a8ff3ee211fccf708e1911bbc096625453ebf759 upstream. This imbalance may cause hangs when TTM is trying to swap out a buffer that is already on the delayed delete list. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 81b6850..7632edb 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1809,6 +1809,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
spin_unlock(&glob->lru_lock);
(void) ttm_bo_cleanup_refs(bo, false, false, false);
kref_put(&bo->list_kref, ttm_bo_release_list);
+ spin_lock(&glob->lru_lock);
continue;
}