[PATCH 7/7] drm/amdgpu: Remove redundant .ras_late_init initialization in some ras blocks

[Zhou1, Tao]

[AMD Official Use Only]



> -----Original Message-----
> From: Chai, Thomas <YiPeng.Chai at amd.com>
> Sent: Tuesday, February 15, 2022 3:41 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Chai, Thomas <YiPeng.Chai at amd.com>; Zhang, Hawking
> <Hawking.Zhang at amd.com>; Zhou1, Tao <Tao.Zhou1 at amd.com>; Clements,
> John <John.Clements at amd.com>; Chai, Thomas <YiPeng.Chai at amd.com>
> Subject: [PATCH 7/7] drm/amdgpu: Remove redundant .ras_late_init
> initialization in some ras blocks
> 
> 1. Define amdgpu_ras_block_late_init_default in amdgpu_ras.c as
>    .ras_late_init common function, which is called when
>    .ras_late_init of ras block doesn't initialize.
[Tao]: doesn't initialize -> "isn't initialized" or "is uninitialized" 

> 2. Remove the code of using amdgpu_ras_block_late_init to
>    initialize .ras_late_init in ras blocks.
> 
> Signed-off-by: yipechai <YiPeng.Chai at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 8 ++++++++
>  drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c   | 4 ----
>  drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c   | 1 -
>  drivers/gpu/drm/amd/amdgpu/mca_v3_0.c   | 3 ---
>  4 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> index 6cb1e5d126d7..ad37df6e50ce 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> @@ -2457,6 +2457,12 @@ int amdgpu_ras_block_late_init(struct
> amdgpu_device *adev,
>  	return r;
>  }
> 
> +int amdgpu_ras_block_late_init_default(struct amdgpu_device *adev,
> +			 struct ras_common_if *ras_block)
> +{
> +	return amdgpu_ras_block_late_init(adev, ras_block); }
> +
>  /* helper function to remove ras fs node and interrupt handler */  void
> amdgpu_ras_block_late_fini(struct amdgpu_device *adev,
>  			  struct ras_common_if *ras_block)
> @@ -2535,6 +2541,8 @@ int amdgpu_ras_late_init(struct amdgpu_device
> *adev)
>  		obj = node->ras_obj;
>  		if (obj->ras_late_init)
>  			obj->ras_late_init(adev, &obj->ras_comm);
> +		else
> +			amdgpu_ras_block_late_init_default(adev, &obj-
> >ras_comm);
>  	}
> 
>  	return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index b719d2c3003b..412e44af1608 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -1291,10 +1291,6 @@ static void gmc_v9_0_set_mmhub_ras_funcs(struct
> amdgpu_device *adev)
>  		adev->mmhub.ras->ras_block.ras_comm.type =
> AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;
>  		adev->mmhub.ras_if = &adev->mmhub.ras-
> >ras_block.ras_comm;
> 
> -		/* If don't define special ras_late_init function, use default
> ras_late_init */
> -		if (!adev->mmhub.ras->ras_block.ras_late_init)
> -			adev->mmhub.ras->ras_block.ras_late_init =
> amdgpu_ras_block_late_init;
> -
>  		/* If don't define special ras_fini function, use default ras_fini */
>  		if (!adev->mmhub.ras->ras_block.ras_fini)
>  			adev->mmhub.ras->ras_block.ras_fini =
> amdgpu_mmhub_ras_fini; diff --git
> a/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
> b/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
> index c9e931f046f7..d7811e0327cb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
> @@ -163,7 +163,6 @@ struct amdgpu_hdp_ras hdp_v4_0_ras = {
>  			.type =
> AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE,
>  		},
>  		.hw_ops = &hdp_v4_0_ras_hw_ops,
> -		.ras_late_init = amdgpu_ras_block_late_init,
>  		.ras_fini = amdgpu_hdp_ras_fini,
>  	},
>  };
> diff --git a/drivers/gpu/drm/amd/amdgpu/mca_v3_0.c
> b/drivers/gpu/drm/amd/amdgpu/mca_v3_0.c
> index 12d09a58b644..b4b36899f5c6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mca_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mca_v3_0.c
> @@ -71,7 +71,6 @@ struct amdgpu_mca_ras_block mca_v3_0_mp0_ras = {
>  		},
>  		.hw_ops = &mca_v3_0_mp0_hw_ops,
>  		.ras_block_match = mca_v3_0_ras_block_match,
> -		.ras_late_init = amdgpu_ras_block_late_init,
>  		.ras_fini = mca_v3_0_mp0_ras_fini,
>  	},
>  };
> @@ -104,7 +103,6 @@ struct amdgpu_mca_ras_block mca_v3_0_mp1_ras = {
>  		},
>  		.hw_ops = &mca_v3_0_mp1_hw_ops,
>  		.ras_block_match = mca_v3_0_ras_block_match,
> -		.ras_late_init = amdgpu_ras_block_late_init,
>  		.ras_fini = mca_v3_0_mp1_ras_fini,
>  	},
>  };
> @@ -137,7 +135,6 @@ struct amdgpu_mca_ras_block mca_v3_0_mpio_ras = {
>  		},
>  		.hw_ops = &mca_v3_0_mpio_hw_ops,
>  		.ras_block_match = mca_v3_0_ras_block_match,
> -		.ras_late_init = amdgpu_ras_block_late_init,
>  		.ras_fini = mca_v3_0_mpio_ras_fini,
>  	},
>  };
> --
> 2.25.1