[PATCH 54/59] drm/ttm: drop list of memory managers from device. (v2)

[Christian König]

Am 04.08.20 um 04:56 schrieb Dave Airlie:
> From: Dave Airlie <airlied at redhat.com>
>
> The driver now controls these, the core just controls the system
> memory one.
>
> v2: init sysman explicitly and assign it as a driver manager
> to simplify the lookup sequence.
>
> 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    | 6 +++---
>   include/drm/ttm/ttm_bo_driver.h | 6 ++----
>   2 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 78b72443a9ef..12abe46bfbc1 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1558,6 +1558,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
>   
>   	man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
>   	ttm_mem_type_manager_disable(man);
> +	ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, NULL);
>   
>   	mutex_lock(&ttm_global_mutex);
>   	list_del(&bdev->device_list);
> @@ -1583,7 +1584,7 @@ EXPORT_SYMBOL(ttm_bo_device_release);
>   
>   static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
>   {
> -	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
> +	struct ttm_mem_type_manager *man = &bdev->sysman;
>   
>   	/*
>   	 * Initialize the system memory buffer type.
> @@ -1594,6 +1595,7 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
>   	man->default_caching = TTM_PL_FLAG_CACHED;
>   
>   	ttm_mem_type_manager_init(man, 0);
> +	ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, man);
>   	ttm_mem_type_manager_set_used(man, true);
>   }
>   
> @@ -1615,8 +1617,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
>   
>   	bdev->driver = driver;
>   
> -	memset(bdev->man_priv, 0, sizeof(bdev->man_priv));
> -
>   	ttm_bo_init_sysman(bdev);
>   
>   	bdev->vma_manager = vma_manager;
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index bfd19400372f..d5646d7cac60 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -414,7 +414,7 @@ struct ttm_bo_device {
>   	/*
>   	 * access via ttm_manager_type.
>   	 */
> -	struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
> +	struct ttm_mem_type_manager sysman;
>   	struct ttm_mem_type_manager *man_drv[TTM_NUM_MEM_TYPES];
>   	/*
>   	 * Protected by internal locks.
> @@ -446,9 +446,7 @@ struct ttm_bo_device {
>   static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
>   							    int mem_type)
>   {
> -	if (bdev->man_drv[mem_type])
> -		return bdev->man_drv[mem_type];
> -	return &bdev->man_priv[mem_type];
> +	return bdev->man_drv[mem_type];
>   }
>   
>   static inline void ttm_set_driver_manager(struct ttm_bo_device *bdev,