Commit 6a057072 authored by Zicheng Qu's avatar Zicheng Qu Committed by Alex Deucher
Browse files

drm/amd/display: Fix null check for pipe_ctx->plane_state in dcn20_program_pipe 



This commit addresses a null pointer dereference issue in
dcn20_program_pipe(). Previously, commit 8e4ed3cf ("drm/amd/display:
Add null check for pipe_ctx->plane_state in dcn20_program_pipe")
partially fixed the null pointer dereference issue. However, in
dcn20_update_dchubp_dpp(), the variable pipe_ctx is passed in, and
plane_state is accessed again through pipe_ctx. Multiple if statements
directly call attributes of plane_state, leading to potential null
pointer dereference issues. This patch adds necessary null checks to
ensure stability.

Fixes: 8e4ed3cf ("drm/amd/display: Add null check for pipe_ctx->plane_state in dcn20_program_pipe")
Reviewed-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarZicheng Qu <quzicheng@huawei.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7037bb04

drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c

+3 −3
Original line number Diff line number Diff line
@@ -1925,9 +1925,9 @@ static void dcn20_program_pipe( 
				dc->res_pool->hubbub, pipe_ctx->plane_res.hubp->inst, pipe_ctx->hubp_regs.det_size);

	}



	if (pipe_ctx->update_flags.raw ||

	    (pipe_ctx->plane_state && pipe_ctx->plane_state->update_flags.raw) ||

	    pipe_ctx->stream->update_flags.raw)

	if (pipe_ctx->plane_state && (pipe_ctx->update_flags.raw ||

	    pipe_ctx->plane_state->update_flags.raw ||

	    pipe_ctx->stream->update_flags.raw))

		dcn20_update_dchubp_dpp(dc, pipe_ctx, context);



	if (pipe_ctx->plane_state && (pipe_ctx->update_flags.bits.enable ||