Commit 285e3004 authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: fix dcn20 odm dpp programming 



dcn20 requires special casing for odm.
This change treats odm as alternative to mpc tree on dcn20.

This is planned to be fixed in a future refactor

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5165d204

drivers/gpu/drm/amd/display/dc/core/dc.c

+1 −0
Original line number Diff line number Diff line
@@ -2026,6 +2026,7 @@ static void commit_planes_for_stream(struct dc *dc, 
		struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];



		if (!pipe_ctx->top_pipe &&

			!pipe_ctx->prev_odm_pipe &&

			pipe_ctx->stream &&

			pipe_ctx->stream == stream) {

			struct dc_stream_status *stream_status = NULL;

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

+6 −1
Original line number Diff line number Diff line
@@ -1054,8 +1054,13 @@ static void dcn20_program_all_pipe_in_tree( 
	if (pipe_ctx->plane_state != NULL)

		dcn20_program_pipe(dc, pipe_ctx, context);



	if (pipe_ctx->bottom_pipe != NULL && pipe_ctx->bottom_pipe != pipe_ctx)

	if (pipe_ctx->bottom_pipe != NULL) {

		ASSERT(pipe_ctx->bottom_pipe != pipe_ctx);

		dcn20_program_all_pipe_in_tree(dc, pipe_ctx->bottom_pipe, context);

	} else if (pipe_ctx->next_odm_pipe != NULL) {

		ASSERT(pipe_ctx->next_odm_pipe != pipe_ctx);

		dcn20_program_all_pipe_in_tree(dc, pipe_ctx->next_odm_pipe, context);

	}

}



void dcn20_pipe_control_lock_global(

CRA Git | Maintained and supported by SUSTech CRA and CCSE