Commit 08b5bb41 authored by Liao Chen's avatar Liao Chen
Browse files

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

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9DNF6


CVE: CVE-2024-26661

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

This reverts commit 9d49a04d.

This patch takes 886571d217d7 ("drm/amd/display: Fix 'panel_cntl' could be null in 'dcn21_set _backlight_level()'") as a dependency, revert and merge its dependency first.

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: default avatarLiao Chen <liaochen4@huawei.com>
parent addad2cb

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

+1 −1
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;