[PATCH v2 2/2] drm/amd/pm: remove redundant tools_size check

Bhavin Sharma posted 2 patches 1 week, 1 day ago
[PATCH v2 2/2] drm/amd/pm: remove redundant tools_size check
Posted by Bhavin Sharma 1 week, 1 day ago
The check for tools_size being non-zero is redundant as tools_size is
explicitly set to a non-zero value (0x19000). Removing the if condition
simplifies the code without altering functionality.

Signed-off-by: Bhavin Sharma <bhavin.sharma@siliconsignals.io>
---
 .../amd/pm/powerplay/smumgr/vega12_smumgr.c   | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c
index b52ce135d84d..d3ff6a831ed5 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c
@@ -257,20 +257,18 @@ static int vega12_smu_init(struct pp_hwmgr *hwmgr)
 	priv->smu_tables.entry[TABLE_WATERMARKS].size = sizeof(Watermarks_t);
 
 	tools_size = 0x19000;
-	if (tools_size) {
-		ret = amdgpu_bo_create_kernel((struct amdgpu_device *)hwmgr->adev,
-					      tools_size,
-					      PAGE_SIZE,
-					      AMDGPU_GEM_DOMAIN_VRAM,
-					      &priv->smu_tables.entry[TABLE_PMSTATUSLOG].handle,
-					      &priv->smu_tables.entry[TABLE_PMSTATUSLOG].mc_addr,
-					      &priv->smu_tables.entry[TABLE_PMSTATUSLOG].table);
-		if (ret)
-			goto err1;
+	ret = amdgpu_bo_create_kernel((struct amdgpu_device *)hwmgr->adev,
+				      tools_size,
+				      PAGE_SIZE,
+				      AMDGPU_GEM_DOMAIN_VRAM,
+				      &priv->smu_tables.entry[TABLE_PMSTATUSLOG].handle,
+				      &priv->smu_tables.entry[TABLE_PMSTATUSLOG].mc_addr,
+				      &priv->smu_tables.entry[TABLE_PMSTATUSLOG].table);
+	if (ret)
+		goto err1;
 
-		priv->smu_tables.entry[TABLE_PMSTATUSLOG].version = 0x01;
-		priv->smu_tables.entry[TABLE_PMSTATUSLOG].size = tools_size;
-	}
+	priv->smu_tables.entry[TABLE_PMSTATUSLOG].version = 0x01;
+	priv->smu_tables.entry[TABLE_PMSTATUSLOG].size = tools_size;
 
 	/* allocate space for AVFS Fuse table */
 	ret = amdgpu_bo_create_kernel((struct amdgpu_device *)hwmgr->adev,
-- 
2.43.0
Re: [PATCH v2 2/2] drm/amd/pm: remove redundant tools_size check
Posted by Alex Deucher 1 week, 1 day ago
Applied.  Thanks!

On Thu, Nov 14, 2024 at 10:12 AM Bhavin Sharma
<bhavin.sharma@siliconsignals.io> wrote:
>
> The check for tools_size being non-zero is redundant as tools_size is
> explicitly set to a non-zero value (0x19000). Removing the if condition
> simplifies the code without altering functionality.
>
> Signed-off-by: Bhavin Sharma <bhavin.sharma@siliconsignals.io>
> ---
>  .../amd/pm/powerplay/smumgr/vega12_smumgr.c   | 24 +++++++++----------
>  1 file changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c
> index b52ce135d84d..d3ff6a831ed5 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c
> @@ -257,20 +257,18 @@ static int vega12_smu_init(struct pp_hwmgr *hwmgr)
>         priv->smu_tables.entry[TABLE_WATERMARKS].size = sizeof(Watermarks_t);
>
>         tools_size = 0x19000;
> -       if (tools_size) {
> -               ret = amdgpu_bo_create_kernel((struct amdgpu_device *)hwmgr->adev,
> -                                             tools_size,
> -                                             PAGE_SIZE,
> -                                             AMDGPU_GEM_DOMAIN_VRAM,
> -                                             &priv->smu_tables.entry[TABLE_PMSTATUSLOG].handle,
> -                                             &priv->smu_tables.entry[TABLE_PMSTATUSLOG].mc_addr,
> -                                             &priv->smu_tables.entry[TABLE_PMSTATUSLOG].table);
> -               if (ret)
> -                       goto err1;
> +       ret = amdgpu_bo_create_kernel((struct amdgpu_device *)hwmgr->adev,
> +                                     tools_size,
> +                                     PAGE_SIZE,
> +                                     AMDGPU_GEM_DOMAIN_VRAM,
> +                                     &priv->smu_tables.entry[TABLE_PMSTATUSLOG].handle,
> +                                     &priv->smu_tables.entry[TABLE_PMSTATUSLOG].mc_addr,
> +                                     &priv->smu_tables.entry[TABLE_PMSTATUSLOG].table);
> +       if (ret)
> +               goto err1;
>
> -               priv->smu_tables.entry[TABLE_PMSTATUSLOG].version = 0x01;
> -               priv->smu_tables.entry[TABLE_PMSTATUSLOG].size = tools_size;
> -       }
> +       priv->smu_tables.entry[TABLE_PMSTATUSLOG].version = 0x01;
> +       priv->smu_tables.entry[TABLE_PMSTATUSLOG].size = tools_size;
>
>         /* allocate space for AVFS Fuse table */
>         ret = amdgpu_bo_create_kernel((struct amdgpu_device *)hwmgr->adev,
> --
> 2.43.0
>