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

Commit 49fac0b4 authored by Eric Bernstein's avatar Eric Bernstein Committed by Alex Deucher
Browse files

drm/amd/display: MPC updates 



Fix update_mpcc logic to only call assert_mpcc_idle_before_connect
if mpcc is not already being used (and required removal).
Update set_out_rate_control to include optional flow control parameter.
In init_mpcc_from_hw check for case where bot_sel is same as mpcc_id.

Signed-off-by: default avatarEric Bernstein <eric.bernstein@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c1fba820

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

+4 −4
Original line number Diff line number Diff line
@@ -1923,7 +1923,7 @@ static void update_mpcc(struct dc *dc, struct pipe_ctx *pipe_ctx) 
	/* remove MPCC if being used */

	if (new_mpcc != NULL)

		mpc->funcs->remove_mpcc(mpc, mpc_tree_params, new_mpcc);



	else

		if (dc->debug.sanity_checks)

			mpc->funcs->assert_mpcc_idle_before_connect(

					dc->res_pool->mpc, mpcc_id);

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

+4 −1
Original line number Diff line number Diff line
@@ -300,11 +300,11 @@ void mpc1_remove_mpcc( 


		if (temp_mpcc && temp_mpcc->mpcc_bot == mpcc_to_remove) {

			found = true;

			temp_mpcc->mpcc_bot = mpcc_to_remove->mpcc_bot;

			if (mpcc_to_remove->mpcc_bot) {

				/* remove MPCC in middle of list */

				REG_SET(MPCC_BOT_SEL[temp_mpcc->mpcc_id], 0,

						MPCC_BOT_SEL, mpcc_to_remove->mpcc_bot->mpcc_id);

				temp_mpcc->mpcc_bot = mpcc_to_remove->mpcc_bot;

			} else {

				/* remove MPCC from bottom of list */

				REG_SET(MPCC_BOT_SEL[temp_mpcc->mpcc_id], 0,
@@ -374,6 +374,9 @@ void mpc1_init_mpcc_list_from_hw( 
			REG_GET(MPCC_TOP_SEL[mpcc_id], MPCC_TOP_SEL, &top_sel);

			REG_GET(MPCC_BOT_SEL[mpcc_id],  MPCC_BOT_SEL, &bot_sel);



			if (bot_sel == mpcc_id)

				bot_sel = 0xf;



			if ((opp_id == tree->opp_id) && (top_sel != 0xf)) {

				mpcc = mpc1_get_mpcc(mpc, mpcc_id);

				mpcc->dpp_id = top_sel;