Commit c14fb01c authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

Revert "drm/amd/display: Block optimize on consecutive FAMS enables" 



This reverts commit ce560ac4.

It depends on its parent commit, which we want to revert.

Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMichel Dänzer <mdaenzer@redhat.com>
[Hamza: fix a whitespace issue in dcn30_prepare_bandwidth()]
Signed-off-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 55e02c14

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

+0 −3
Original line number Diff line number Diff line
@@ -2117,9 +2117,6 @@ void dcn20_optimize_bandwidth( 
		dc_dmub_srv_p_state_delegate(dc,

			true, context);

		context->bw_ctx.bw.dcn.clk.p_state_change_support = true;

		dc->clk_mgr->clks.fw_based_mclk_switching = true;

	} else {

		dc->clk_mgr->clks.fw_based_mclk_switching = false;

	}



	dc->clk_mgr->funcs->update_clocks(

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c

+3 −19
Original line number Diff line number Diff line
@@ -985,11 +985,7 @@ void dcn30_set_disp_pattern_generator(const struct dc *dc, 
void dcn30_prepare_bandwidth(struct dc *dc,

			     struct dc_state *context)

{

	bool p_state_change_support = context->bw_ctx.bw.dcn.clk.p_state_change_support;

	/* Any transition into an FPO config should disable MCLK switching first to avoid

	 * driver and FW P-State synchronization issues.

	 */

	if (context->bw_ctx.bw.dcn.clk.fw_based_mclk_switching || dc->clk_mgr->clks.fw_based_mclk_switching) {

	if (context->bw_ctx.bw.dcn.clk.fw_based_mclk_switching) {

		dc->optimized_required = true;

		context->bw_ctx.bw.dcn.clk.p_state_change_support = false;

	}
@@ -1000,19 +996,7 @@ void dcn30_prepare_bandwidth(struct dc *dc, 
			dc->clk_mgr->funcs->set_max_memclk(dc->clk_mgr, dc->clk_mgr->bw_params->clk_table.entries[dc->clk_mgr->bw_params->clk_table.num_entries - 1].memclk_mhz);



	dcn20_prepare_bandwidth(dc, context);

	/*

	 * enabled -> enabled: do not disable

	 * enabled -> disabled: disable

	 * disabled -> enabled: don't care

	 * disabled -> disabled: don't care

	 */

	if (!context->bw_ctx.bw.dcn.clk.fw_based_mclk_switching)

		dc_dmub_srv_p_state_delegate(dc, false, context);



	if (context->bw_ctx.bw.dcn.clk.fw_based_mclk_switching || dc->clk_mgr->clks.fw_based_mclk_switching) {

		/* After disabling P-State, restore the original value to ensure we get the correct P-State

		 * on the next optimize. */

		context->bw_ctx.bw.dcn.clk.p_state_change_support = p_state_change_support;

	}

	dc_dmub_srv_p_state_delegate(dc, false, context);

}