]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/amd/display: Fix && vs || typos
authorDan Carpenter <dan.carpenter@linaro.org>
Fri, 9 Feb 2024 13:02:42 +0000 (16:02 +0300)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 15 Feb 2024 19:18:42 +0000 (14:18 -0500)
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()'")
Reviewed-by: Anthony Koo <anthony.koo@amd.com>
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c

index 5c7f380a84f91ecb1a668e4798be6aaf9347a46f..7252f5f781f0d7869e147846bc1eb44f09e63593 100644 (file)
@@ -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;