Re: [PATCH 2/4] drm/ttm: add ttm_resource_fini

[Christian König <ckoenig.leichtzumerken@xxxxxxxxx>]

Ah, crap forget this patch. I wanted to squash it into the next one.

Am 10.06.21 um 13:05 schrieb Christian König:
> For now that function is just a stub.
>
> Signed-off-by: Christian König <christian.koenig@xxxxxxx>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c  | 1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 1 +
>   drivers/gpu/drm/nouveau/nouveau_ttm.c        | 1 +
>   drivers/gpu/drm/ttm/ttm_range_manager.c      | 1 +
>   drivers/gpu/drm/ttm/ttm_resource.c           | 5 +++++
>   drivers/gpu/drm/ttm/ttm_sys_manager.c        | 1 +
>   drivers/gpu/drm/vmwgfx/vmwgfx_thp.c          | 1 +
>   include/drm/ttm/ttm_resource.h               | 2 ++
>   8 files changed, 13 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> index 8e3f5da44e4f..95d1cd338cf4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> @@ -187,6 +187,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man,
>   	spin_unlock(&mgr->lock);
>   	atomic64_add(res->num_pages, &mgr->available);
>   
> +	ttm_resource_fini(&node->base);
>   	kfree(node);
>   }
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index 9a6df02477ce..9f0eb93123ec 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -510,6 +510,7 @@ static void amdgpu_vram_mgr_del(struct ttm_resource_manager *man,
>   	atomic64_sub(usage, &mgr->usage);
>   	atomic64_sub(vis_usage, &mgr->vis_usage);
>   
> +	ttm_resource_fini(&node->base);
>   	kvfree(node);
>   }
>   
> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> index f4c2e46b6fe1..1969759ee2ee 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> @@ -38,6 +38,7 @@
>   static void
>   nouveau_manager_del(struct ttm_resource_manager *man, struct ttm_resource *reg)
>   {
> +	ttm_resource_fini(reg);
>   	nouveau_mem_del(reg);
>   }
>   
> diff --git a/drivers/gpu/drm/ttm/ttm_range_manager.c b/drivers/gpu/drm/ttm/ttm_range_manager.c
> index 03395386e8a7..3636601fd4b0 100644
> --- a/drivers/gpu/drm/ttm/ttm_range_manager.c
> +++ b/drivers/gpu/drm/ttm/ttm_range_manager.c
> @@ -108,6 +108,7 @@ static void ttm_range_man_free(struct ttm_resource_manager *man,
>   	drm_mm_remove_node(&node->mm_nodes[0]);
>   	spin_unlock(&rman->lock);
>   
> +	ttm_resource_fini(&node->base);
>   	kfree(node);
>   }
>   
> diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c
> index 7ff6194154fe..5df1c63373cf 100644
> --- a/drivers/gpu/drm/ttm/ttm_resource.c
> +++ b/drivers/gpu/drm/ttm/ttm_resource.c
> @@ -45,6 +45,11 @@ void ttm_resource_init(struct ttm_buffer_object *bo,
>   }
>   EXPORT_SYMBOL(ttm_resource_init);
>   
> +void ttm_resource_fini(struct ttm_resource *res)
> +{
> +}
> +EXPORT_SYMBOL(ttm_resource_fini);
> +
>   int ttm_resource_alloc(struct ttm_buffer_object *bo,
>   		       const struct ttm_place *place,
>   		       struct ttm_resource **res_ptr)
> diff --git a/drivers/gpu/drm/ttm/ttm_sys_manager.c b/drivers/gpu/drm/ttm/ttm_sys_manager.c
> index 63aca52f75e1..4427bf6b076b 100644
> --- a/drivers/gpu/drm/ttm/ttm_sys_manager.c
> +++ b/drivers/gpu/drm/ttm/ttm_sys_manager.c
> @@ -23,6 +23,7 @@ static int ttm_sys_man_alloc(struct ttm_resource_manager *man,
>   static void ttm_sys_man_free(struct ttm_resource_manager *man,
>   			     struct ttm_resource *res)
>   {
> +	ttm_resource_fini(res);
>   	kfree(res);
>   }
>   
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
> index 2a3d3468e4e0..414d3713f250 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
> @@ -123,6 +123,7 @@ static void vmw_thp_put_node(struct ttm_resource_manager *man,
>   	drm_mm_remove_node(&node->mm_nodes[0]);
>   	spin_unlock(&rman->lock);
>   
> +	ttm_resource_fini(&node->base);
>   	kfree(node);
>   }
>   
> diff --git a/include/drm/ttm/ttm_resource.h b/include/drm/ttm/ttm_resource.h
> index 6d0b7a6d2169..7fc42db688b8 100644
> --- a/include/drm/ttm/ttm_resource.h
> +++ b/include/drm/ttm/ttm_resource.h
> @@ -263,6 +263,8 @@ ttm_resource_manager_cleanup(struct ttm_resource_manager *man)
>   void ttm_resource_init(struct ttm_buffer_object *bo,
>                          const struct ttm_place *place,
>                          struct ttm_resource *res);
> +void ttm_resource_fini(struct ttm_resource *res);
> +
>   int ttm_resource_alloc(struct ttm_buffer_object *bo,
>   		       const struct ttm_place *place,
>   		       struct ttm_resource **res);