2022-08-23 07:33:00

by 赵军奎

Subject: [PATCH v2] drm/amd: remove duplicated argument to &&

This patch trf to fis cocci warning:
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c:
2349:8-34: duplicated argument to && or ||
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c:
3680:8-55: duplicated argument to && or ||

Signed-off-by: Bernard Zhao <[email protected]>
---
.../gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
index cb2025771646..f99c1696a1f6 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
@@ -2346,8 +2346,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l

if (mode_lib->vba.DSCEnable[k] && mode_lib->vba.ForcedOutputLinkBPP[k] != 0)
mode_lib->vba.DSCOnlyIfNecessaryWithBPP = true;
- if ((mode_lib->vba.DSCEnable[k] || mode_lib->vba.DSCEnable[k])
- && mode_lib->vba.OutputFormat[k] == dm_n422
+ if (mode_lib->vba.DSCEnable[k] && mode_lib->vba.OutputFormat[k] == dm_n422
&& !mode_lib->vba.DSC422NativeSupport)
mode_lib->vba.DSC422NativeNotSupported = true;

@@ -3678,7 +3677,6 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
if (mode_lib->vba.SourcePixelFormat[k] != dm_444_64
&& mode_lib->vba.SourcePixelFormat[k] != dm_444_32
&& mode_lib->vba.SourcePixelFormat[k] != dm_444_16
- && mode_lib->vba.SourcePixelFormat[k] != dm_444_16
&& mode_lib->vba.SourcePixelFormat[k] != dm_444_8
&& mode_lib->vba.SourcePixelFormat[k] != dm_rgbe) {
if (mode_lib->vba.ViewportWidthChroma[k] > mode_lib->vba.SurfaceWidthC[k]
--
2.33.1

2022-08-23 15:52:34

by Maira Canal

Subject: Re: [PATCH v2] drm/amd: remove duplicated argument to &&

Hi Bernard

On 8/23/22 04:14, Bernard Zhao wrote:
> This patch trf to fis cocci warning:

I believe that there are a couple of typos on this description. Maybe
you could fixed to s/trf/try and s/fis/fix.

> drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c:
> 2349:8-34: duplicated argument to && or ||
> drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c:
> 3680:8-55: duplicated argument to && or ||
>
> Signed-off-by: Bernard Zhao <[email protected]>

Also, it would be nice to have a changelog between the versions.

Other than those small nits,

Reviewed-by: Maíra Canal <[email protected]>

Best Regards,
- Maíra Canal

> ---
> .../gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
> index cb2025771646..f99c1696a1f6 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
> @@ -2346,8 +2346,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
>
> if (mode_lib->vba.DSCEnable[k] && mode_lib->vba.ForcedOutputLinkBPP[k] != 0)
> mode_lib->vba.DSCOnlyIfNecessaryWithBPP = true;
> - if ((mode_lib->vba.DSCEnable[k] || mode_lib->vba.DSCEnable[k])
> - && mode_lib->vba.OutputFormat[k] == dm_n422
> + if (mode_lib->vba.DSCEnable[k] && mode_lib->vba.OutputFormat[k] == dm_n422
> && !mode_lib->vba.DSC422NativeSupport)
> mode_lib->vba.DSC422NativeNotSupported = true;
>
> @@ -3678,7 +3677,6 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
> if (mode_lib->vba.SourcePixelFormat[k] != dm_444_64
> && mode_lib->vba.SourcePixelFormat[k] != dm_444_32
> && mode_lib->vba.SourcePixelFormat[k] != dm_444_16
> - && mode_lib->vba.SourcePixelFormat[k] != dm_444_16
> && mode_lib->vba.SourcePixelFormat[k] != dm_444_8
> && mode_lib->vba.SourcePixelFormat[k] != dm_rgbe) {
> if (mode_lib->vba.ViewportWidthChroma[k] > mode_lib->vba.SurfaceWidthC[k]