Commit d4f07450 authored by Dan Carpenter's avatar Dan Carpenter Committed by Liao Chen
Browse files

drm/amd/display: Fix && vs || typos 

mainline inclusion
from mainline-v6.8-rc5
commit 17ba9cde11c2bfebbd70867b0a2ac4a22e573379
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9DNF6
CVE: CVE-2024-26661

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=17ba9cde11c2bfebbd70867b0a2ac4a22e573379



--------------------------------

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: default avatarAnthony Koo <anthony.koo@amd.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>

Conflicts:
	drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c
	drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c
[lc: adjust context]
Signed-off-by: default avatarLiao Chen <liaochen4@huawei.com>
parent 5ada4a93

drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,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;
@@ -209,7 +209,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;