Received-SPF: pass (google.com: domain of linux-kernel+bounces-202779-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240604103736.3068-1-thorsten.blum@toblux.com>
In-Reply-To: <20240604103736.3068-1-thorsten.blum@toblux.com>
From: Alex Deucher <alexdeucher@gmail.com>
Date: Wed, 5 Jun 2024 10:35:51 -0400
Message-ID: <CADnq5_OtyaYJAcMpd6hmo4jShFq+1NjDHW5_TEcQB+Hf3yxaqQ@mail.gmail.com>
Subject: Re: [PATCH] drm/amd/display: Simplify if conditions
To: Thorsten Blum <thorsten.blum@toblux.com>
Cc: harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, 
	alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, 
	daniel@ffwll.ch, Qingqing.Zhuo@amd.com, roman.li@amd.com, hersenxs.wu@amd.com, 
	chaitanya.dhere@amd.com, wenjing.liu@amd.com, alex.hung@amd.com, 
	sungkim@amd.com, syed.hassan@amd.com, syedsaaem.rizvi@amd.com, 
	dillon.varone@amd.com, charlene.liu@amd.com, hamza.mahfooz@amd.com, 
	nicholas.kazlauskas@amd.com, jerry.zuo@amd.com, amd-gfx@lists.freedesktop.org, 
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Applied.  Thanks!

Alex

On Tue, Jun 4, 2024 at 9:07=E2=80=AFAM Thorsten Blum <thorsten.blum@toblux.=
com> wrote:
>
> The if conditions !A || A && B can be simplified to !A || B.
>
> Fixes the following Coccinelle/coccicheck warnings reported by
> excluded_middle.cocci:
>
>         WARNING !A || A && B is equivalent to !A || B
>         WARNING !A || A && B is equivalent to !A || B
>         WARNING !A || A && B is equivalent to !A || B
>
> Compile-tested only.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
> ---
>  drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 6 +++---
>  .../gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c   | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c =
b/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
> index ad2a6b4769fe..940081df6dc0 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
> @@ -68,7 +68,7 @@ static bool get_plane_id(struct dml2_context *dml2, con=
st struct dc_state *state
>                 if (state->streams[i]->stream_id =3D=3D stream_id) {
>                         for (j =3D 0; j < state->stream_status[i].plane_c=
ount; j++) {
>                                 if (state->stream_status[i].plane_states[=
j] =3D=3D plane &&
> -                                       (!is_plane_duplicate || (is_plane=
_duplicate && (j =3D=3D plane_index)))) {
> +                                       (!is_plane_duplicate || (j =3D=3D=
 plane_index))) {
>                                         *plane_id =3D (i << 16) | j;
>                                         return true;
>                                 }
> @@ -707,8 +707,8 @@ static void free_unused_pipes_for_plane(struct dml2_c=
ontext *ctx, struct dc_stat
>         for (i =3D 0; i < ctx->config.dcn_pipe_count; i++) {
>                 if (state->res_ctx.pipe_ctx[i].plane_state =3D=3D plane &=
&
>                         state->res_ctx.pipe_ctx[i].stream->stream_id =3D=
=3D stream_id &&
> -                       (!is_plane_duplicate || (is_plane_duplicate &&
> -                       ctx->v20.scratch.dml_to_dc_pipe_mapping.dml_pipe_=
idx_to_plane_index[state->res_ctx.pipe_ctx[i].pipe_idx] =3D=3D plane_index)=
) &&
> +                       (!is_plane_duplicate ||
> +                       ctx->v20.scratch.dml_to_dc_pipe_mapping.dml_pipe_=
idx_to_plane_index[state->res_ctx.pipe_ctx[i].pipe_idx] =3D=3D plane_index)=
 &&
>                         !is_pipe_used(pool, state->res_ctx.pipe_ctx[i].pi=
pe_idx)) {
>                         free_pipe(&state->res_ctx.pipe_ctx[i]);
>                 }
> diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.=
c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
> index a41812598ce8..b2bbf7988f92 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
> @@ -979,7 +979,7 @@ static bool get_plane_id(struct dml2_context *dml2, c=
onst struct dc_state *conte
>                 if (context->streams[i]->stream_id =3D=3D stream_id) {
>                         for (j =3D 0; j < context->stream_status[i].plane=
_count; j++) {
>                                 if (context->stream_status[i].plane_state=
s[j] =3D=3D plane &&
> -                                       (!is_plane_duplicate || (is_plane=
_duplicate && (j =3D=3D plane_index)))) {
> +                                       (!is_plane_duplicate || (j =3D=3D=
 plane_index))) {
>                                         *plane_id =3D (i << 16) | j;
>                                         return true;
>                                 }
> --
> 2.39.2
>