[PATCH 03/11] drm/ttm: remove io_reserve_fastpath flag

[daniel at ffwll.ch]

On Tue, Jul 21, 2020 at 09:32:37AM +0200, Christian König wrote:
> Just use the use_io_reserve_lru flag. It doesn't make much
> sense to have two flags.
> 
> Signed-off-by: Christian König <christian.koenig at amd.com>

Yeah looks entirely redundant.

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/nouveau/nouveau_bo.c | 1 -
>  drivers/gpu/drm/ttm/ttm_bo.c         | 1 -
>  drivers/gpu/drm/ttm/ttm_bo_util.c    | 8 ++++----
>  include/drm/ttm/ttm_bo_driver.h      | 2 --
>  4 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index a48652826f67..a1037478fa3f 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -675,7 +675,6 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
>  			}
>  
>  			man->func = &nouveau_vram_manager;
> -			man->io_reserve_fastpath = false;
>  			man->use_io_reserve_lru = true;
>  		} else {
>  			man->func = &ttm_bo_manager_func;
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 7be36b9996ed..8b9e7f62bea7 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1521,7 +1521,6 @@ int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
>  	BUG_ON(type >= TTM_NUM_MEM_TYPES);
>  	man = &bdev->man[type];
>  	BUG_ON(man->has_type);
> -	man->io_reserve_fastpath = true;
>  	man->use_io_reserve_lru = false;
>  	mutex_init(&man->io_reserve_mutex);
>  	spin_lock_init(&man->move_lock);
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
> index 7d2c50fef456..6c05f4fd15ae 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
> @@ -93,7 +93,7 @@ EXPORT_SYMBOL(ttm_bo_move_ttm);
>  
>  int ttm_mem_io_lock(struct ttm_mem_type_manager *man, bool interruptible)
>  {
> -	if (likely(man->io_reserve_fastpath))
> +	if (likely(!man->use_io_reserve_lru))
>  		return 0;
>  
>  	if (interruptible)
> @@ -105,7 +105,7 @@ int ttm_mem_io_lock(struct ttm_mem_type_manager *man, bool interruptible)
>  
>  void ttm_mem_io_unlock(struct ttm_mem_type_manager *man)
>  {
> -	if (likely(man->io_reserve_fastpath))
> +	if (likely(!man->use_io_reserve_lru))
>  		return;
>  
>  	mutex_unlock(&man->io_reserve_mutex);
> @@ -136,7 +136,7 @@ int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
>  
>  	if (!bdev->driver->io_mem_reserve)
>  		return 0;
> -	if (likely(man->io_reserve_fastpath))
> +	if (likely(!man->use_io_reserve_lru))
>  		return bdev->driver->io_mem_reserve(bdev, mem);
>  
>  	if (bdev->driver->io_mem_reserve &&
> @@ -157,7 +157,7 @@ void ttm_mem_io_free(struct ttm_bo_device *bdev,
>  {
>  	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
>  
> -	if (likely(man->io_reserve_fastpath))
> +	if (likely(!man->use_io_reserve_lru))
>  		return;
>  
>  	if (bdev->driver->io_mem_reserve &&
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index 732167cad130..45522e4fbd6b 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -155,7 +155,6 @@ struct ttm_mem_type_manager_func {
>   * @use_io_reserve_lru: Use an lru list to try to unreserve io_mem_regions
>   * reserved by the TTM vm system.
>   * @io_reserve_lru: Optional lru list for unreserving io mem regions.
> - * @io_reserve_fastpath: Only use bdev::driver::io_mem_reserve to obtain
>   * @move_lock: lock for move fence
>   * static information. bdev::driver::io_mem_free is never used.
>   * @lru: The lru list for this memory type.
> @@ -184,7 +183,6 @@ struct ttm_mem_type_manager {
>  	void *priv;
>  	struct mutex io_reserve_mutex;
>  	bool use_io_reserve_lru;
> -	bool io_reserve_fastpath;
>  	spinlock_t move_lock;
>  
>  	/*
> -- 
> 2.17.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch