* RE: [PATCH] drm/amd/display: Fix && vs || typos
2024-02-09 13:02 [PATCH] drm/amd/display: Fix && vs || typos Dan Carpenter
@ 2024-02-09 14:12 ` Koo, Anthony
2024-02-09 17:13 ` Hamza Mahfooz
1 sibling, 0 replies; 3+ messages in thread
From: Koo, Anthony @ 2024-02-09 14:12 UTC (permalink / raw)
To: Dan Carpenter, SHANMUGAM, SRINIVASAN
Cc: Wentland, Harry, Li, Sun peng (Leo),
Siqueira, Rodrigo, Deucher, Alexander, Koenig, Christian, Pan,
Xinhui, David Airlie, Daniel Vetter, Kazlauskas, Nicholas, Pavic,
Josip, Huang, Leon, Adhuri, Mounika, Huang, Lewis, amd-gfx,
dri-devel, linux-kernel, kernel-janitors
[AMD Official Use Only - General]
Reviewed-by: Anthony Koo <Anthony.Koo@amd.com>
Looks good, my mistake for not noticing this!
Thanks,
Anthony
-----Original Message-----
From: Dan Carpenter <dan.carpenter@linaro.org>
Sent: Friday, February 9, 2024 8:03 AM
To: SHANMUGAM, SRINIVASAN <SRINIVASAN.SHANMUGAM@amd.com>
Cc: Wentland, Harry <Harry.Wentland@amd.com>; Li, Sun peng (Leo) <Sunpeng.Li@amd.com>; Siqueira, Rodrigo <Rodrigo.Siqueira@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; David Airlie <airlied@gmail.com>; Daniel Vetter <daniel@ffwll.ch>; Kazlauskas, Nicholas <Nicholas.Kazlauskas@amd.com>; Koo, Anthony <Anthony.Koo@amd.com>; Pavic, Josip <Josip.Pavic@amd.com>; Huang, Leon <Leon.Huang1@amd.com>; Adhuri, Mounika <Mounika.Adhuri@amd.com>; Huang, Lewis <Lewis.Huang@amd.com>; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-kernel@vger.kernel.org; kernel-janitors@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@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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/amd/display: Fix && vs || typos
2024-02-09 13:02 [PATCH] drm/amd/display: Fix && vs || typos Dan Carpenter
2024-02-09 14:12 ` Koo, Anthony
@ 2024-02-09 17:13 ` Hamza Mahfooz
1 sibling, 0 replies; 3+ messages in thread
From: Hamza Mahfooz @ 2024-02-09 17:13 UTC (permalink / raw)
To: Dan Carpenter, Srinivasan Shanmugam
Cc: Harry Wentland, Leo Li, Rodrigo Siqueira, Alex Deucher,
Christian König, Pan, Xinhui, David Airlie, Daniel Vetter,
Nicholas Kazlauskas, Anthony Koo, Josip Pavic, Leon Huang,
Mounika Adhuri, Lewis Huang, amd-gfx, dri-devel, linux-kernel,
kernel-janitors
On 2/9/24 08:02, Dan Carpenter wrote:
> 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@linaro.org>
Applied, thanks!
> ---
> 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;
--
Hamza
^ permalink raw reply [flat|nested] 3+ messages in thread