Unverified Commit 832e9cf5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13128 drm/amd/display: Add null check for pipe_ctx->plane_state in dcn20_program_pipe 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zicheng Qu <quzicheng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/T4S3WE54RVT5DTTNQOUJWK6UC4QPAMLM/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRAY 
 
Link:https://gitee.com/openeuler/kernel/pulls/13128

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents e7d9f8db 967f54ea

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

+9 −5
Original line number Diff line number Diff line
@@ -1601,16 +1601,20 @@ static void dcn20_program_pipe( 
			dc->res_pool->hubbub->funcs->force_wm_propagate_to_pipes(dc->res_pool->hubbub);

	}



	if (pipe_ctx->update_flags.raw || pipe_ctx->plane_state->update_flags.raw || pipe_ctx->stream->update_flags.raw)

	if (pipe_ctx->update_flags.raw ||

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

		pipe_ctx->stream->update_flags.raw)

		dcn20_update_dchubp_dpp(dc, pipe_ctx, context);



	if (pipe_ctx->update_flags.bits.enable

			|| pipe_ctx->plane_state->update_flags.bits.hdr_mult)

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

	    (pipe_ctx->plane_state && pipe_ctx->plane_state->update_flags.bits.hdr_mult))

		hws->funcs.set_hdr_multiplier(pipe_ctx);



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

			pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change ||

			pipe_ctx->plane_state->update_flags.bits.gamma_change)

			(pipe_ctx->plane_state &&

			pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change) ||

			(pipe_ctx->plane_state &&

			pipe_ctx->plane_state->update_flags.bits.gamma_change))

		hws->funcs.set_input_transfer_func(dc, pipe_ctx, pipe_ctx->plane_state);



	/* dcn10_translate_regamma_to_hw_format takes 750us to finish