Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f10f3c2 authored by Tony Cheng's avatar Tony Cheng Committed by Alex Deucher
Browse files

drm/amd/display: mpcc disconnect and pipe pg in multi-display 



still quite hacky.  but this address not properly shutdown pipe video underlay
+ enable another display case, as well as mode changes with video overlay.

Signed-off-by: default avatarEric Yang <Eric.Yang2@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Reviewed-by: default avatarEric Yang <eric.yang2@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9b1c9b4c

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+18 −5
Original line number Diff line number Diff line
@@ -1669,30 +1669,46 @@ static void dcn10_apply_ctx_for_surface( 
		struct core_surface *surface,

		struct validate_context *context)

{

	int i;

	int i, be_idx;



	if (dc->public.debug.sanity_checks)

		verify_allow_pstate_change_high(dc->hwseq);



	if (!surface)

		return;



	for (be_idx = 0; be_idx < dc->res_pool->pipe_count; be_idx++)

		if (surface == context->res_ctx.pipe_ctx[be_idx].surface)

			break;



	/* reset unused mpcc */

	for (i = 0; i < dc->res_pool->pipe_count; i++) {

		struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];

		struct pipe_ctx *old_pipe_ctx =

				&dc->current_context->res_ctx.pipe_ctx[i];



		if (!pipe_ctx->surface && !old_pipe_ctx->surface)

			continue;



		/*

		 * Powergate reused pipes that are not powergated

		 * fairly hacky right now, using opp_id as indicator

		 */



		if (pipe_ctx->surface && !old_pipe_ctx->surface) {

			if (pipe_ctx->mpcc->opp_id != 0xf)

			if (pipe_ctx->mpcc->opp_id != 0xf && pipe_ctx->tg->inst == be_idx)

				dcn10_power_down_fe(dc, pipe_ctx->pipe_idx);

		}





		if ((!pipe_ctx->surface && old_pipe_ctx->surface)

				|| (!pipe_ctx->stream && old_pipe_ctx->stream)) {

			struct mpcc_cfg mpcc_cfg;

			int opp_id_cached = old_pipe_ctx->mpcc->opp_id;



			if (old_pipe_ctx->tg->inst != be_idx)

				continue;



			if (!old_pipe_ctx->top_pipe) {

				ASSERT(0);

				continue;
@@ -1725,9 +1741,6 @@ static void dcn10_apply_ctx_for_surface( 
		}

	}



	if (!surface)

		return;



	for (i = 0; i < dc->res_pool->pipe_count; i++) {

		struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];