[PATCH] drm/amd/display: Delete duplicated argument to '&&' or '||'

[Alex Deucher]

On Thu, Sep 17, 2020 at 11:09 AM Ye Bin <yebin10 at huawei.com> wrote:
>
> Fixes coccicheck warnig:
> drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c:282:12-42:
> duplicated argument to && or ||
> drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:3240:12-42:
> duplicated argument to && or ||
> drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:5520:7-91:
> duplicated argument to && or ||
> drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:5309:86-122:
> duplicated argument to && or ||
>
> Fixes: 6725a88f88a7 ("drm/amd/display: Add DCN3 DML")
> Reported-by: Hulk Robot <hulkci at huawei.com>
> Signed-off-by: Ye Bin <yebin10 at huawei.com>

Applied.  Thanks!

Alex

> ---
>  drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c    | 6 +++---
>  drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> index 8f8bf83a60a1..50b7d011705d 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> @@ -3237,7 +3237,7 @@ static bool CalculateBytePerPixelAnd256BBlockSizes(
>                 *BytePerPixelDETC = 0;
>                 *BytePerPixelY = 4;
>                 *BytePerPixelC = 0;
> -       } else if (SourcePixelFormat == dm_444_16 || SourcePixelFormat == dm_444_16) {
> +       } else if (SourcePixelFormat == dm_444_16) {
>                 *BytePerPixelDETY = 2;
>                 *BytePerPixelDETC = 0;
>                 *BytePerPixelY = 2;
> @@ -5307,7 +5307,7 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
>                         ViewportExceedsSurface = true;
>
>                 if (v->SourcePixelFormat[k] != dm_444_64 && v->SourcePixelFormat[k] != dm_444_32 && v->SourcePixelFormat[k] != dm_444_16
> -                               && v->SourcePixelFormat[k] != dm_444_16 && v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) {
> +                               && v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) {
>                         if (v->ViewportWidthChroma[k] > v->SurfaceWidthC[k] || v->ViewportHeightChroma[k] > v->SurfaceHeightC[k]) {
>                                 ViewportExceedsSurface = true;
>                         }
> @@ -5517,7 +5517,7 @@ static void CalculateWatermarksAndDRAMSpeedChangeSupport(
>                         if (WritebackPixelFormat[k] == dm_444_64) {
>                                 WritebackDRAMClockChangeLatencyHiding = WritebackDRAMClockChangeLatencyHiding / 2;
>                         }
> -                       if (mode_lib->vba.WritebackConfiguration == dm_whole_buffer_for_single_stream_interleave || mode_lib->vba.WritebackConfiguration == dm_whole_buffer_for_single_stream_interleave) {
> +                       if (mode_lib->vba.WritebackConfiguration == dm_whole_buffer_for_single_stream_interleave) {
>                                 WritebackDRAMClockChangeLatencyHiding = WritebackDRAMClockChangeLatencyHiding * 2;
>                         }
>                         WritebackDRAMClockChangeLatencyMargin = WritebackDRAMClockChangeLatencyHiding - mode_lib->vba.WritebackDRAMClockChangeWatermark;
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c
> index 5bb10f6e300d..416bf6fb67bd 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c
> @@ -279,7 +279,7 @@ static bool CalculateBytePerPixelAnd256BBlockSizes(
>                 *BytePerPixelDETC = 0;
>                 *BytePerPixelY = 4;
>                 *BytePerPixelC = 0;
> -       } else if (SourcePixelFormat == dm_444_16 || SourcePixelFormat == dm_444_16) {
> +       } else if (SourcePixelFormat == dm_444_16) {
>                 *BytePerPixelDETY = 2;
>                 *BytePerPixelDETC = 0;
>                 *BytePerPixelY = 2;
> --
> 2.16.2.dirty
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx