diff options
author | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
commit | 1fbe6f625f69e48c4001051dc1431afc704acfaa (patch) | |
tree | 826b741201a2e09a627ed350c6ff36935f5cff79 /drivers/gpu/drm/ttm | |
parent | 0cecdd818cd79d092e36e70dfe3a71f2878d6b96 (diff) | |
parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) |
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Diffstat (limited to 'drivers/gpu/drm/ttm')
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 119b6e3ff906..2f0eab66ece6 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c | |||
@@ -562,10 +562,16 @@ retry: | |||
562 | return ret; | 562 | return ret; |
563 | 563 | ||
564 | spin_lock(&glob->lru_lock); | 564 | spin_lock(&glob->lru_lock); |
565 | |||
566 | if (unlikely(list_empty(&bo->ddestroy))) { | ||
567 | spin_unlock(&glob->lru_lock); | ||
568 | return 0; | ||
569 | } | ||
570 | |||
565 | ret = ttm_bo_reserve_locked(bo, interruptible, | 571 | ret = ttm_bo_reserve_locked(bo, interruptible, |
566 | no_wait_reserve, false, 0); | 572 | no_wait_reserve, false, 0); |
567 | 573 | ||
568 | if (unlikely(ret != 0) || list_empty(&bo->ddestroy)) { | 574 | if (unlikely(ret != 0)) { |
569 | spin_unlock(&glob->lru_lock); | 575 | spin_unlock(&glob->lru_lock); |
570 | return ret; | 576 | return ret; |
571 | } | 577 | } |