mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 15:47:36 +00:00
Code Issues Releases Wiki Activity

drm/ttm: use a helper for unlocked moves to the lru tail

Browse source 
The pattern was repeated a few times, just make an inline for it.

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-7-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-08-04 12:55:39 +10:00
parent 46bca88bbd
commit 20784cdf4b
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/ttm/ttm_bo.c
View file

@ -1101,9 +1101,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
error: error:
if (bo->mem.mem_type == TTM_PL_SYSTEM && !list_empty(&bo->lru)) { if (bo->mem.mem_type == TTM_PL_SYSTEM && !list_empty(&bo->lru)) {
spin_lock(&ttm_bo_glob.lru_lock); ttm_bo_move_to_lru_tail_unlocked(bo);
ttm_bo_move_to_lru_tail(bo, NULL);
spin_unlock(&ttm_bo_glob.lru_lock);
} }
return ret; return ret;
@ -1318,9 +1316,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,
return ret; return ret;
} }
spin_lock(&ttm_bo_glob.lru_lock); ttm_bo_move_to_lru_tail_unlocked(bo);
ttm_bo_move_to_lru_tail(bo, NULL);
spin_unlock(&ttm_bo_glob.lru_lock);
return ret; return ret;
} }

4
drivers/gpu/drm/ttm/ttm_bo_vm.c
View file

@ -306,9 +306,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
} }
if (bo->moving != moving) { if (bo->moving != moving) {
spin_lock(&ttm_bo_glob.lru_lock); ttm_bo_move_to_lru_tail_unlocked(bo);
ttm_bo_move_to_lru_tail(bo, NULL);
spin_unlock(&ttm_bo_glob.lru_lock);
} }
dma_fence_put(moving); dma_fence_put(moving);
} }

11
include/drm/ttm/ttm_bo_driver.h
View file

@ -669,6 +669,13 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
return 0; return 0;
} }
static inline void ttm_bo_move_to_lru_tail_unlocked(struct ttm_buffer_object *bo)
{
spin_lock(&ttm_bo_glob.lru_lock);
ttm_bo_move_to_lru_tail(bo, NULL);
spin_unlock(&ttm_bo_glob.lru_lock);
}
/** /**
* ttm_bo_unreserve * ttm_bo_unreserve
* *
@ -678,9 +685,7 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
*/ */
static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo) static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
{ {
spin_lock(&ttm_bo_glob.lru_lock); ttm_bo_move_to_lru_tail_unlocked(bo);
ttm_bo_move_to_lru_tail(bo, NULL);
spin_unlock(&ttm_bo_glob.lru_lock);
dma_resv_unlock(bo->base.resv); dma_resv_unlock(bo->base.resv);
} }