[PATCH v2 0/2] Remove redundant check

[PATCH v2 0/2] Remove redundant check

[Bhavin Sharma]

Change in V2:

in patch 1/2:
	- Remove mode_422 condition check because that
	  is fixed in amd-staging-drm-next

Link for v1: https://lore.kernel.org/dri-devel/20241111120900.63869-1-bhavin.sharma@siliconsignals.io/T/#t

Bhavin Sharma (2):
  drm/amd/display: remove redundant is_dsc_possible check
  drm/amd/pm: remove redundant tools_size check

 drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c   | 13 ++++------
 .../amd/pm/powerplay/smumgr/vega12_smumgr.c   | 24 +++++++++----------
 2 files changed, 16 insertions(+), 21 deletions(-)

-- 
2.43.0

[PATCH v2 1/2] drm/amd/display: remove redundant is_dsc_possible check

[Bhavin Sharma]

Since is_dsc_possible is already checked just above, there's no need to
check it again before filling out the DSC settings.

Signed-off-by: Bhavin Sharma <bhavin.sharma@siliconsignals.io>
---
 drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c b/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
index ebd5df1a36e8..85f6f8e43947 100644
--- a/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
+++ b/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
@@ -1093,14 +1093,11 @@ static bool setup_dsc_config(
 	if (!is_dsc_possible)
 		goto done;
 
-	// Final decission: can we do DSC or not?
-	if (is_dsc_possible) {
-		// Fill out the rest of DSC settings
-		dsc_cfg->block_pred_enable = dsc_common_caps.is_block_pred_supported;
-		dsc_cfg->linebuf_depth = dsc_common_caps.lb_bit_depth;
-		dsc_cfg->version_minor = (dsc_common_caps.dsc_version & 0xf0) >> 4;
-		dsc_cfg->is_dp = dsc_sink_caps->is_dp;
-	}
+	// Fill out the rest of DSC settings
+	dsc_cfg->block_pred_enable = dsc_common_caps.is_block_pred_supported;
+	dsc_cfg->linebuf_depth = dsc_common_caps.lb_bit_depth;
+	dsc_cfg->version_minor = (dsc_common_caps.dsc_version & 0xf0) >> 4;
+	dsc_cfg->is_dp = dsc_sink_caps->is_dp;
 
 done:
 	if (!is_dsc_possible)
-- 
2.43.0

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

[Bhavin Sharma]

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 1/2] drm/amd/display: remove redundant is_dsc_possible check

[Christian König]

Am 14.11.24 um 16:11 schrieb Bhavin Sharma:
> Since is_dsc_possible is already checked just above, there's no need to
> check it again before filling out the DSC settings.
>
> Signed-off-by: Bhavin Sharma <bhavin.sharma@siliconsignals.io>
> ---
>   drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 13 +++++--------
>   1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c b/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
> index ebd5df1a36e8..85f6f8e43947 100644
> --- a/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
> +++ b/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
> @@ -1093,14 +1093,11 @@ static bool setup_dsc_config(
>   	if (!is_dsc_possible)
>   		goto done;
>   
> -	// Final decission: can we do DSC or not?
> -	if (is_dsc_possible) {
> -		// Fill out the rest of DSC settings
> -		dsc_cfg->block_pred_enable = dsc_common_caps.is_block_pred_supported;
> -		dsc_cfg->linebuf_depth = dsc_common_caps.lb_bit_depth;
> -		dsc_cfg->version_minor = (dsc_common_caps.dsc_version & 0xf0) >> 4;
> -		dsc_cfg->is_dp = dsc_sink_caps->is_dp;
> -	}
> +	// Fill out the rest of DSC settings

While at it you should probably replace the // style comment with /* */.

Apart from that looks good to me.

Christian.

> +	dsc_cfg->block_pred_enable = dsc_common_caps.is_block_pred_supported;
> +	dsc_cfg->linebuf_depth = dsc_common_caps.lb_bit_depth;
> +	dsc_cfg->version_minor = (dsc_common_caps.dsc_version & 0xf0) >> 4;
> +	dsc_cfg->is_dp = dsc_sink_caps->is_dp;
>   
>   done:
>   	if (!is_dsc_possible)

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

[Alex Deucher]

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
>

Re: [PATCH v2 1/2] drm/amd/display: remove redundant is_dsc_possible check

[Alex Deucher]

On Thu, Nov 14, 2024 at 10:21 AM Christian König
<christian.koenig@amd.com> wrote:
>
> Am 14.11.24 um 16:11 schrieb Bhavin Sharma:
> > Since is_dsc_possible is already checked just above, there's no need to
> > check it again before filling out the DSC settings.
> >
> > Signed-off-by: Bhavin Sharma <bhavin.sharma@siliconsignals.io>
> > ---
> >   drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 13 +++++--------
> >   1 file changed, 5 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c b/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
> > index ebd5df1a36e8..85f6f8e43947 100644
> > --- a/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
> > +++ b/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
> > @@ -1093,14 +1093,11 @@ static bool setup_dsc_config(
> >       if (!is_dsc_possible)
> >               goto done;
> >
> > -     // Final decission: can we do DSC or not?
> > -     if (is_dsc_possible) {
> > -             // Fill out the rest of DSC settings
> > -             dsc_cfg->block_pred_enable = dsc_common_caps.is_block_pred_supported;
> > -             dsc_cfg->linebuf_depth = dsc_common_caps.lb_bit_depth;
> > -             dsc_cfg->version_minor = (dsc_common_caps.dsc_version & 0xf0) >> 4;
> > -             dsc_cfg->is_dp = dsc_sink_caps->is_dp;
> > -     }
> > +     // Fill out the rest of DSC settings
>
> While at it you should probably replace the // style comment with /* */.
>
> Apart from that looks good to me.

Fixed up locally and applied.

Thanks,

Alex

>
> Christian.
>
> > +     dsc_cfg->block_pred_enable = dsc_common_caps.is_block_pred_supported;
> > +     dsc_cfg->linebuf_depth = dsc_common_caps.lb_bit_depth;
> > +     dsc_cfg->version_minor = (dsc_common_caps.dsc_version & 0xf0) >> 4;
> > +     dsc_cfg->is_dp = dsc_sink_caps->is_dp;
> >
> >   done:
> >       if (!is_dsc_possible)
>