diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-10-29 04:46:46 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-11-08 22:33:33 -0500 |
commit | 6e4c55db120b03d411e0eff7cd35f3edabbefe14 (patch) | |
tree | 998197578cb7824f7a4812b600b0b384f75d3aea /drivers/gpu/drm/ttm | |
parent | d7a67cb16238abb3109c111761797e0584a6caf9 (diff) |
drm/ttm: Remove pointless list_empty check
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/ttm')
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index cf47978cf0e2..e6cedf43c2db 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c | |||
@@ -814,7 +814,6 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo, | |||
814 | bool no_wait_gpu) | 814 | bool no_wait_gpu) |
815 | { | 815 | { |
816 | struct ttm_bo_device *bdev = bo->bdev; | 816 | struct ttm_bo_device *bdev = bo->bdev; |
817 | struct ttm_bo_global *glob = bdev->glob; | ||
818 | struct ttm_mem_type_manager *man = &bdev->man[mem_type]; | 817 | struct ttm_mem_type_manager *man = &bdev->man[mem_type]; |
819 | int ret; | 818 | int ret; |
820 | 819 | ||
@@ -824,12 +823,6 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo, | |||
824 | return ret; | 823 | return ret; |
825 | if (mem->mm_node) | 824 | if (mem->mm_node) |
826 | break; | 825 | break; |
827 | spin_lock(&glob->lru_lock); | ||
828 | if (list_empty(&man->lru)) { | ||
829 | spin_unlock(&glob->lru_lock); | ||
830 | break; | ||
831 | } | ||
832 | spin_unlock(&glob->lru_lock); | ||
833 | ret = ttm_mem_evict_first(bdev, mem_type, interruptible, | 826 | ret = ttm_mem_evict_first(bdev, mem_type, interruptible, |
834 | no_wait_reserve, no_wait_gpu); | 827 | no_wait_reserve, no_wait_gpu); |
835 | if (unlikely(ret != 0)) | 828 | if (unlikely(ret != 0)) |