[PATCH 07/11] drm/amdgpu: remove PL_PREEMPT accounting

[Felix Kuehling]

Am 2022-02-14 um 04:34 schrieb Christian König:
> This is provided by TTM now.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>

This patch is

Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>


> ---
>   .../gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c   | 62 ++-----------------
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h       |  7 +--
>   2 files changed, 6 insertions(+), 63 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> index 0d85c2096ab5..e8adfd0a570a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> @@ -25,12 +25,6 @@
>   
>   #include "amdgpu.h"
>   
> -static inline struct amdgpu_preempt_mgr *
> -to_preempt_mgr(struct ttm_resource_manager *man)
> -{
> -	return container_of(man, struct amdgpu_preempt_mgr, manager);
> -}
> -
>   /**
>    * DOC: mem_info_preempt_used
>    *
> @@ -45,10 +39,9 @@ static ssize_t mem_info_preempt_used_show(struct device *dev,
>   {
>   	struct drm_device *ddev = dev_get_drvdata(dev);
>   	struct amdgpu_device *adev = drm_to_adev(ddev);
> -	struct ttm_resource_manager *man;
> +	struct ttm_resource_manager *man = &adev->mman.preempt_mgr;
>   
> -	man = ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_PREEMPT);
> -	return sysfs_emit(buf, "%llu\n", amdgpu_preempt_mgr_usage(man));
> +	return sysfs_emit(buf, "%llu\n", ttm_resource_manager_usage(man));
>   }
>   
>   static DEVICE_ATTR_RO(mem_info_preempt_used);
> @@ -68,16 +61,12 @@ static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
>   				  const struct ttm_place *place,
>   				  struct ttm_resource **res)
>   {
> -	struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
> -
>   	*res = kzalloc(sizeof(**res), GFP_KERNEL);
>   	if (!*res)
>   		return -ENOMEM;
>   
>   	ttm_resource_init(tbo, place, *res);
>   	(*res)->start = AMDGPU_BO_INVALID_OFFSET;
> -
> -	atomic64_add((*res)->num_pages, &mgr->used);
>   	return 0;
>   }
>   
> @@ -92,49 +81,13 @@ static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
>   static void amdgpu_preempt_mgr_del(struct ttm_resource_manager *man,
>   				   struct ttm_resource *res)
>   {
> -	struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
> -
> -	atomic64_sub(res->num_pages, &mgr->used);
>   	ttm_resource_fini(man, res);
>   	kfree(res);
>   }
>   
> -/**
> - * amdgpu_preempt_mgr_usage - return usage of PREEMPT domain
> - *
> - * @man: TTM memory type manager
> - *
> - * Return how many bytes are used in the GTT domain
> - */
> -uint64_t amdgpu_preempt_mgr_usage(struct ttm_resource_manager *man)
> -{
> -	struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
> -	s64 result = atomic64_read(&mgr->used);
> -
> -	return (result > 0 ? result : 0) * PAGE_SIZE;
> -}
> -
> -/**
> - * amdgpu_preempt_mgr_debug - dump VRAM table
> - *
> - * @man: TTM memory type manager
> - * @printer: DRM printer to use
> - *
> - * Dump the table content using printk.
> - */
> -static void amdgpu_preempt_mgr_debug(struct ttm_resource_manager *man,
> -				     struct drm_printer *printer)
> -{
> -	struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
> -
> -	drm_printf(printer, "man size:%llu pages, preempt used:%lld pages\n",
> -		   man->size, (u64)atomic64_read(&mgr->used));
> -}
> -
>   static const struct ttm_resource_manager_func amdgpu_preempt_mgr_func = {
>   	.alloc = amdgpu_preempt_mgr_new,
>   	.free = amdgpu_preempt_mgr_del,
> -	.debug = amdgpu_preempt_mgr_debug
>   };
>   
>   /**
> @@ -146,8 +99,7 @@ static const struct ttm_resource_manager_func amdgpu_preempt_mgr_func = {
>    */
>   int amdgpu_preempt_mgr_init(struct amdgpu_device *adev)
>   {
> -	struct amdgpu_preempt_mgr *mgr = &adev->mman.preempt_mgr;
> -	struct ttm_resource_manager *man = &mgr->manager;
> +	struct ttm_resource_manager *man = &adev->mman.preempt_mgr;
>   	int ret;
>   
>   	man->use_tt = true;
> @@ -155,16 +107,13 @@ int amdgpu_preempt_mgr_init(struct amdgpu_device *adev)
>   
>   	ttm_resource_manager_init(man, &adev->mman.bdev, (1 << 30));
>   
> -	atomic64_set(&mgr->used, 0);
> -
>   	ret = device_create_file(adev->dev, &dev_attr_mem_info_preempt_used);
>   	if (ret) {
>   		DRM_ERROR("Failed to create device file mem_info_preempt_used\n");
>   		return ret;
>   	}
>   
> -	ttm_set_driver_manager(&adev->mman.bdev, AMDGPU_PL_PREEMPT,
> -			       &mgr->manager);
> +	ttm_set_driver_manager(&adev->mman.bdev, AMDGPU_PL_PREEMPT, man);
>   	ttm_resource_manager_set_used(man, true);
>   	return 0;
>   }
> @@ -179,8 +128,7 @@ int amdgpu_preempt_mgr_init(struct amdgpu_device *adev)
>    */
>   void amdgpu_preempt_mgr_fini(struct amdgpu_device *adev)
>   {
> -	struct amdgpu_preempt_mgr *mgr = &adev->mman.preempt_mgr;
> -	struct ttm_resource_manager *man = &mgr->manager;
> +	struct ttm_resource_manager *man = &adev->mman.preempt_mgr;
>   	int ret;
>   
>   	ttm_resource_manager_set_used(man, false);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
> index 120b69ec9885..4e8577dad16a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
> @@ -54,11 +54,6 @@ struct amdgpu_gtt_mgr {
>   	spinlock_t lock;
>   };
>   
> -struct amdgpu_preempt_mgr {
> -	struct ttm_resource_manager manager;
> -	atomic64_t used;
> -};
> -
>   struct amdgpu_mman {
>   	struct ttm_device		bdev;
>   	bool				initialized;
> @@ -75,7 +70,7 @@ struct amdgpu_mman {
>   
>   	struct amdgpu_vram_mgr vram_mgr;
>   	struct amdgpu_gtt_mgr gtt_mgr;
> -	struct amdgpu_preempt_mgr preempt_mgr;
> +	struct ttm_resource_manager preempt_mgr;
>   
>   	uint64_t		stolen_vga_size;
>   	struct amdgpu_bo	*stolen_vga_memory;