[PATCH] drm/amd/display: Fix && vs || typos

Koo, Anthony Anthony.Koo at amd.com
Fri Feb 9 14:12:15 UTC 2024


[AMD Official Use Only - General]

Reviewed-by: Anthony Koo <Anthony.Koo at amd.com>

Looks good, my mistake for not noticing this!

Thanks,
Anthony

-----Original Message-----
From: Dan Carpenter <dan.carpenter at linaro.org>
Sent: Friday, February 9, 2024 8:03 AM
To: SHANMUGAM, SRINIVASAN <SRINIVASAN.SHANMUGAM at amd.com>
Cc: Wentland, Harry <Harry.Wentland at amd.com>; Li, Sun peng (Leo) <Sunpeng.Li at amd.com>; Siqueira, Rodrigo <Rodrigo.Siqueira at amd.com>; Deucher, Alexander <Alexander.Deucher at amd.com>; Koenig, Christian <Christian.Koenig at amd.com>; Pan, Xinhui <Xinhui.Pan at amd.com>; David Airlie <airlied at gmail.com>; Daniel Vetter <daniel at ffwll.ch>; Kazlauskas, Nicholas <Nicholas.Kazlauskas at amd.com>; Koo, Anthony <Anthony.Koo at amd.com>; Pavic, Josip <Josip.Pavic at amd.com>; Huang, Leon <Leon.Huang1 at amd.com>; Adhuri, Mounika <Mounika.Adhuri at amd.com>; Huang, Lewis <Lewis.Huang at amd.com>; amd-gfx at lists.freedesktop.org; dri-devel at lists.freedesktop.org; linux-kernel at vger.kernel.org; kernel-janitors at vger.kernel.org
Subject: [PATCH] drm/amd/display: Fix && vs || typos

These ANDs should be ORs or it will lead to a NULL dereference.

Fixes: fb5a3d037082 ("drm/amd/display: Add NULL test for 'timing generator' in 'dcn21_set_pipe()'")
Fixes: 886571d217d7 ("drm/amd/display: Fix 'panel_cntl' could be null in 'dcn21_set_backlight_level()'")
Signed-off-by: Dan Carpenter <dan.carpenter at linaro.org>
---
 drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c
index 5c7f380a84f9..7252f5f781f0 100644
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c
@@ -211,7 +211,7 @@ void dcn21_set_pipe(struct pipe_ctx *pipe_ctx)
        struct dmcu *dmcu = pipe_ctx->stream->ctx->dc->res_pool->dmcu;
        uint32_t otg_inst;

-       if (!abm && !tg && !panel_cntl)
+       if (!abm || !tg || !panel_cntl)
                return;

        otg_inst = tg->inst;
@@ -245,7 +245,7 @@ bool dcn21_set_backlight_level(struct pipe_ctx *pipe_ctx,
        struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl;
        uint32_t otg_inst;

-       if (!abm && !tg && !panel_cntl)
+       if (!abm || !tg || !panel_cntl)
                return false;

        otg_inst = tg->inst;
--
2.43.0



More information about the amd-gfx mailing list