[PATCH 1/5] drm/amdgpu: Fix the code style warnings in amdgpu_ras

Chai, Thomas YiPeng.Chai at amd.com
Fri Jan 14 03:57:38 UTC 2022


OK, I will update the patches to add the fixed warning types.

-----Original Message-----
From: Zhou1, Tao <Tao.Zhou1 at amd.com> 
Sent: Friday, January 14, 2022 11:45 AM
To: Chai, Thomas <YiPeng.Chai at amd.com>; amd-gfx at lists.freedesktop.org
Cc: Zhang, Hawking <Hawking.Zhang at amd.com>; Clements, John <John.Clements at amd.com>
Subject: RE: [PATCH 1/5] drm/amdgpu: Fix the code style warnings in amdgpu_ras

[AMD Official Use Only]



> -----Original Message-----
> From: Chai, Thomas <YiPeng.Chai at amd.com>
> Sent: Friday, January 14, 2022 11:36 AM
> 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 1/5] drm/amdgpu: Fix the code style warnings in 
> amdgpu_ras
> 
> Fix the code style warnings in amdgpu_ras.

[Tao] Could you add more description to explain the warnings you want to fix?

> 
> Signed-off-by: yipechai <YiPeng.Chai at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 41 
> +++++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 10 
> +++---
>  2 files changed, 30 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> index 0bb6b5354802..23502b2b0770 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> @@ -872,7 +872,7 @@ static int amdgpu_ras_enable_all_features(struct
> amdgpu_device *adev,  static int amdgpu_ras_block_match_default(struct
> amdgpu_ras_block_object *block_obj,
>  		enum amdgpu_ras_block block)
>  {
> -	if(!block_obj)
> +	if (!block_obj)
>  		return -EINVAL;
> 
>  	if (block_obj->block == block)
> @@ -881,7 +881,7 @@ static int amdgpu_ras_block_match_default(struct
> amdgpu_ras_block_object *block_
>  	return -EINVAL;
>  }
> 
> -static struct amdgpu_ras_block_object* 
> amdgpu_ras_get_ras_block(struct amdgpu_device *adev,
> +static struct amdgpu_ras_block_object 
> +*amdgpu_ras_get_ras_block(struct amdgpu_device *adev,
>  					enum amdgpu_ras_block block,
> uint32_t sub_block_index)  {
>  	struct amdgpu_ras_block_object *obj, *tmp; @@ -941,7 +941,7 @@ 
> static void amdgpu_ras_get_ecc_info(struct amdgpu_device *adev, struct 
> ras_err_d  int amdgpu_ras_query_error_status(struct amdgpu_device *adev,
>  				  struct ras_query_if *info)
>  {
> -	struct amdgpu_ras_block_object* block_obj = NULL;
> +	struct amdgpu_ras_block_object *block_obj = NULL;
>  	struct ras_manager *obj = amdgpu_ras_find_obj(adev, &info->head);
>  	struct ras_err_data err_data = {0, 0, 0, NULL};
> 
> @@ -953,7 +953,7 @@ int amdgpu_ras_query_error_status(struct
> amdgpu_device *adev,
>  	} else {
>  		block_obj = amdgpu_ras_get_ras_block(adev, info->head.block, 0);
>  		if (!block_obj || !block_obj->hw_ops)   {
> -			dev_info(adev->dev, "%s doesn't config ras function \n",
> +			dev_info(adev->dev, "%s doesn't config ras function.\n",
>  					get_ras_block_str(&info->head));
>  			return -EINVAL;
>  		}
> @@ -1023,13 +1023,14 @@ int amdgpu_ras_query_error_status(struct
> amdgpu_device *adev,  int amdgpu_ras_reset_error_status(struct
> amdgpu_device *adev,
>  		enum amdgpu_ras_block block)
>  {
> -	struct amdgpu_ras_block_object* block_obj =
> amdgpu_ras_get_ras_block(adev, block, 0);
> +	struct amdgpu_ras_block_object *block_obj = 
> +amdgpu_ras_get_ras_block(adev, block, 0);
> 
>  	if (!amdgpu_ras_is_supported(adev, block))
>  		return -EINVAL;
> 
>  	if (!block_obj || !block_obj->hw_ops)   {
> -		dev_info(adev->dev, "%s doesn't config ras function \n",
> ras_block_str(block));
> +		dev_info(adev->dev, "%s doesn't config ras function.\n",
> +				ras_block_str(block));
>  		return -EINVAL;
>  	}
> 
> @@ -1066,7 +1067,8 @@ int amdgpu_ras_error_inject(struct amdgpu_device 
> *adev,
>  		return -EINVAL;
> 
>  	if (!block_obj || !block_obj->hw_ops)	{
> -		dev_info(adev->dev, "%s doesn't config ras function \n",
> get_ras_block_str(&info->head));
> +		dev_info(adev->dev, "%s doesn't config ras function.\n",
> +					get_ras_block_str(&info->head));
>  		return -EINVAL;
>  	}
> 
> @@ -1702,19 +1704,25 @@ static void 
> amdgpu_ras_log_on_err_counter(struct
> amdgpu_device *adev)  static void amdgpu_ras_error_status_query(struct
> amdgpu_device *adev,
>  					  struct ras_query_if *info)
>  {
> -	struct amdgpu_ras_block_object* block_obj =
> amdgpu_ras_get_ras_block(adev, info->head.block, info-
> >head.sub_block_index);
> +	struct amdgpu_ras_block_object *block_obj =
> amdgpu_ras_get_ras_block(adev,
> +									info-
> >head.block,
> +									info-
> >head.sub_block_index);
>  	/*
>  	 * Only two block need to query read/write
>  	 * RspStatus at current state
>  	 */
>  	if ((info->head.block != AMDGPU_RAS_BLOCK__GFX) &&
>  		(info->head.block != AMDGPU_RAS_BLOCK__MMHUB))
> -		return ;
> +		return;
> +
> +	block_obj = amdgpu_ras_get_ras_block(adev,
> +					info->head.block,
> +					info->head.sub_block_index);
> 
> -	block_obj = amdgpu_ras_get_ras_block(adev, info->head.block, info-
> >head.sub_block_index);
>  	if (!block_obj || !block_obj->hw_ops) {
> -		dev_info(adev->dev, "%s doesn't config ras function \n",
> get_ras_block_str(&info->head));
> -		return ;
> +		dev_info(adev->dev, "%s doesn't config ras function.\n",
> +			get_ras_block_str(&info->head));
> +		return;
>  	}
> 
>  	if (block_obj->hw_ops->query_ras_error_status)
> @@ -2715,7 +2723,7 @@ static void
> amdgpu_register_bad_pages_mca_notifier(struct amdgpu_device *adev)  } 
> #endif
> 
> -struct amdgpu_ras* amdgpu_ras_get_context(struct amdgpu_device *adev)
> +struct amdgpu_ras *amdgpu_ras_get_context(struct amdgpu_device *adev)
>  {
>  	if (!adev)
>  		return NULL;
> @@ -2723,7 +2731,7 @@ struct amdgpu_ras* amdgpu_ras_get_context(struct 
> amdgpu_device *adev)
>  	return adev->psp.ras_context.ras;
>  }
> 
> -int amdgpu_ras_set_context(struct amdgpu_device *adev, struct 
> amdgpu_ras*
> ras_con)
> +int amdgpu_ras_set_context(struct amdgpu_device *adev, struct 
> +amdgpu_ras *ras_con)
>  {
>  	if (!adev)
>  		return -EINVAL;
> @@ -2755,7 +2763,7 @@ int amdgpu_ras_reset_gpu(struct amdgpu_device
> *adev)
> 
>  /* Register each ip ras block into amdgpu ras */  int 
> amdgpu_ras_register_ras_block(struct amdgpu_device *adev,
> -		struct amdgpu_ras_block_object* ras_block_obj)
> +		struct amdgpu_ras_block_object *ras_block_obj)
>  {
>  	struct amdgpu_ras_block_object *obj, *tmp;
>  	if (!adev || !ras_block_obj)
> @@ -2766,9 +2774,8 @@ int amdgpu_ras_register_ras_block(struct
> amdgpu_device *adev,
> 
>  	/* If the ras object is in ras_list, don't add it again */
>  	list_for_each_entry_safe(obj, tmp, &adev->ras_list, node) {
> -		if (obj == ras_block_obj) {
> +		if (obj == ras_block_obj)
>  			return 0;
> -		}
>  	}
> 
>  	INIT_LIST_HEAD(&ras_block_obj->node);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> index 7a4d82378205..a51a281bd91a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> @@ -496,7 +496,8 @@ struct amdgpu_ras_block_object {
>  	/* ras block link */
>  	struct list_head node;
> 
> -	int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj,
> enum amdgpu_ras_block block, uint32_t sub_block_index);
> +	int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj,
> +				enum amdgpu_ras_block block, uint32_t
> sub_block_index);
>  	int (*ras_late_init)(struct amdgpu_device *adev, void *ras_info);
>  	void (*ras_fini)(struct amdgpu_device *adev);
>  	const struct amdgpu_ras_block_hw_ops *hw_ops; @@ -504,7 +505,7 @@ 
> struct amdgpu_ras_block_object {
> 
>  struct amdgpu_ras_block_hw_ops {
>  	int  (*ras_error_inject)(struct amdgpu_device *adev, void *inject_if);
> -	void (*query_ras_error_count)(struct amdgpu_device *adev,void
> *ras_error_status);
> +	void (*query_ras_error_count)(struct amdgpu_device *adev, void 
> +*ras_error_status);
>  	void (*query_ras_error_status)(struct amdgpu_device *adev);
>  	void (*query_ras_error_address)(struct amdgpu_device *adev, void 
> *ras_error_status);
>  	void (*reset_ras_error_count)(struct amdgpu_device *adev); @@ -
> 678,7 +679,8 @@ int amdgpu_ras_reset_gpu(struct amdgpu_device *adev);
> 
>  struct amdgpu_ras* amdgpu_ras_get_context(struct amdgpu_device 
> *adev);
> 
> -int amdgpu_ras_set_context(struct amdgpu_device *adev, struct 
> amdgpu_ras* ras_con);
> +int amdgpu_ras_set_context(struct amdgpu_device *adev, struct 
> +amdgpu_ras *ras_con);
> 
> -int amdgpu_ras_register_ras_block(struct amdgpu_device *adev, struct
> amdgpu_ras_block_object* ras_block_obj);
> +int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,
> +				struct amdgpu_ras_block_object
> *ras_block_obj);
>  #endif
> --
> 2.25.1


More information about the amd-gfx mailing list