[PATCH v4 11/15] drm/amdgpu: clean the dummy hw_fini functions

[Christian König]

Am 17.10.24 um 12:06 schrieb Sunil Khatri:
> Remove the dummy hw_fini functions for all
> ip blocks.

As discussed on the call hw_init() and hw_fini() are the only two 
functions I consider mandatory.

So please drop this patch here and as a follow up task maybe look into 
why vkms and mes_v12 don't have a hw_fini function.

For SI and CIK we probably don't care any more since those are to old.

Regards,
Christian.

>
> Signed-off-by: Sunil Khatri <sunil.khatri at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c |  6 ------
>   drivers/gpu/drm/amd/amdgpu/cik.c         |  6 ------
>   drivers/gpu/drm/amd/amdgpu/mes_v12_0.c   | 11 +----------
>   drivers/gpu/drm/amd/amdgpu/si.c          |  6 ------
>   4 files changed, 1 insertion(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> index ed8015313827..e3a399bfab61 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> @@ -600,11 +600,6 @@ static int amdgpu_vkms_hw_init(struct amdgpu_ip_block *ip_block)
>   	return 0;
>   }
>   
> -static int amdgpu_vkms_hw_fini(struct amdgpu_ip_block *ip_block)
> -{
> -	return 0;
> -}
> -
>   static int amdgpu_vkms_suspend(struct amdgpu_ip_block *ip_block)
>   {
>   	struct amdgpu_device *adev = ip_block->adev;
> @@ -661,7 +656,6 @@ static const struct amd_ip_funcs amdgpu_vkms_ip_funcs = {
>   	.sw_init = amdgpu_vkms_sw_init,
>   	.sw_fini = amdgpu_vkms_sw_fini,
>   	.hw_init = amdgpu_vkms_hw_init,
> -	.hw_fini = amdgpu_vkms_hw_fini,
>   	.suspend = amdgpu_vkms_suspend,
>   	.resume = amdgpu_vkms_resume,
>   	.is_idle = amdgpu_vkms_is_idle,
> diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
> index c8fb592f13df..9cb25d0d1051 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cik.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cik.c
> @@ -2138,11 +2138,6 @@ static int cik_common_hw_init(struct amdgpu_ip_block *ip_block)
>   	return 0;
>   }
>   
> -static int cik_common_hw_fini(struct amdgpu_ip_block *ip_block)
> -{
> -	return 0;
> -}
> -
>   static int cik_common_resume(struct amdgpu_ip_block *ip_block)
>   {
>   	return cik_common_hw_init(ip_block);
> @@ -2181,7 +2176,6 @@ static const struct amd_ip_funcs cik_common_ip_funcs = {
>   	.early_init = cik_common_early_init,
>   	.late_init = NULL,
>   	.hw_init = cik_common_hw_init,
> -	.hw_fini = cik_common_hw_fini,
>   	.resume = cik_common_resume,
>   	.is_idle = cik_common_is_idle,
>   	.wait_for_idle = cik_common_wait_for_idle,
> diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> index 9d0e342a2f81..a1af5c90f79a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> @@ -40,7 +40,6 @@ MODULE_FIRMWARE("amdgpu/gc_12_0_1_mes1.bin");
>   MODULE_FIRMWARE("amdgpu/gc_12_0_1_uni_mes.bin");
>   
>   static int mes_v12_0_hw_init(struct amdgpu_ip_block *ip_block);
> -static int mes_v12_0_hw_fini(struct amdgpu_ip_block *ip_block);
>   static int mes_v12_0_kiq_hw_init(struct amdgpu_device *adev);
>   static int mes_v12_0_kiq_hw_fini(struct amdgpu_device *adev);
>   
> @@ -1516,7 +1515,6 @@ static int mes_v12_0_kiq_hw_init(struct amdgpu_device *adev)
>   	return r;
>   
>   failure:
> -	mes_v12_0_hw_fini(ip_block);
>   	return r;
>   }
>   
> @@ -1600,15 +1598,9 @@ static int mes_v12_0_hw_init(struct amdgpu_ip_block *ip_block)
>   	return 0;
>   
>   failure:
> -	mes_v12_0_hw_fini(ip_block);
>   	return r;
>   }
>   
> -static int mes_v12_0_hw_fini(struct amdgpu_ip_block *ip_block)
> -{
> -	return 0;
> -}
> -
>   static int mes_v12_0_suspend(struct amdgpu_ip_block *ip_block)
>   {
>   	int r;
> @@ -1617,7 +1609,7 @@ static int mes_v12_0_suspend(struct amdgpu_ip_block *ip_block)
>   	if (r)
>   		return r;
>   
> -	return mes_v12_0_hw_fini(ip_block);
> +	return 0;
>   }
>   
>   static int mes_v12_0_resume(struct amdgpu_ip_block *ip_block)
> @@ -1663,7 +1655,6 @@ static const struct amd_ip_funcs mes_v12_0_ip_funcs = {
>   	.sw_init = mes_v12_0_sw_init,
>   	.sw_fini = mes_v12_0_sw_fini,
>   	.hw_init = mes_v12_0_hw_init,
> -	.hw_fini = mes_v12_0_hw_fini,
>   	.suspend = mes_v12_0_suspend,
>   	.resume = mes_v12_0_resume,
>   };
> diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
> index 66ccb76eb72a..e1b3bef6992a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/si.c
> +++ b/drivers/gpu/drm/amd/amdgpu/si.c
> @@ -2634,11 +2634,6 @@ static int si_common_hw_init(struct amdgpu_ip_block *ip_block)
>   	return 0;
>   }
>   
> -static int si_common_hw_fini(struct amdgpu_ip_block *ip_block)
> -{
> -	return 0;
> -}
> -
>   static int si_common_resume(struct amdgpu_ip_block *ip_block)
>   {
>   	return si_common_hw_init(ip_block);
> @@ -2676,7 +2671,6 @@ static const struct amd_ip_funcs si_common_ip_funcs = {
>   	.early_init = si_common_early_init,
>   	.late_init = NULL,
>   	.hw_init = si_common_hw_init,
> -	.hw_fini = si_common_hw_fini,
>   	.resume = si_common_resume,
>   	.is_idle = si_common_is_idle,
>   	.wait_for_idle = si_common_wait_for_idle,