[PATCH 06/59] drm/ttm: use a helper for unlocked moves to the lru tail

[Christian König]

Am 04.08.20 um 04:55 schrieb Dave Airlie:
> From: Dave Airlie <airlied at redhat.com>
>
> The pattern was repeated a few times, just make an inline for it.
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/ttm/ttm_bo.c    |  8 ++------
>   drivers/gpu/drm/ttm/ttm_bo_vm.c |  4 +---
>   include/drm/ttm/ttm_bo_driver.h | 11 ++++++++---
>   3 files changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 721ff546bf47..2b49037231eb 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1103,9 +1103,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
>   
>   error:
>   	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(bo, NULL);
> -		spin_unlock(&ttm_bo_glob.lru_lock);
> +		ttm_bo_move_to_lru_tail_unlocked(bo);
>   	}
>   
>   	return ret;
> @@ -1320,9 +1318,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,
>   		return ret;
>   	}
>   
> -	spin_lock(&ttm_bo_glob.lru_lock);
> -	ttm_bo_move_to_lru_tail(bo, NULL);
> -	spin_unlock(&ttm_bo_glob.lru_lock);
> +	ttm_bo_move_to_lru_tail_unlocked(bo);
>   
>   	return ret;
>   }
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
> index d7a6537dd6ee..468a0eb9e632 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
> @@ -308,9 +308,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
>   		}
>   
>   		if (bo->moving != moving) {
> -			spin_lock(&ttm_bo_glob.lru_lock);
> -			ttm_bo_move_to_lru_tail(bo, NULL);
> -			spin_unlock(&ttm_bo_glob.lru_lock);
> +			ttm_bo_move_to_lru_tail_unlocked(bo);
>   		}
>   		dma_fence_put(moving);
>   	}
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index c20fef4da1d3..7958e411269a 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -658,6 +658,13 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
>   	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
>    *
> @@ -667,9 +674,7 @@ static inline int ttm_bo_reserve_slowpath(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(bo, NULL);
> -	spin_unlock(&ttm_bo_glob.lru_lock);
> +	ttm_bo_move_to_lru_tail_unlocked(bo);
>   	dma_resv_unlock(bo->base.resv);
>   }
>