Commit 0de34efc authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: fix clk_mgr naming 



clk_mgr is called dccg in dc_state, this change fixes that

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarEric Bernstein <Eric.Bernstein@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e49f6936

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

+1 −1
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ static enum dc_status enable_link_dp( 


	pipe_ctx->stream_res.pix_clk_params.requested_sym_clk =

			link_settings.link_rate * LINK_RATE_REF_FREQ_IN_KHZ;

	state->dccg->funcs->update_clocks(state->dccg, state, false);

	state->clk_mgr->funcs->update_clocks(state->clk_mgr, state, false);



	dp_enable_link_phy(

		link,

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

+1 −1
Original line number Diff line number Diff line
@@ -2064,7 +2064,7 @@ void dc_resource_state_construct( 
		const struct dc *dc,

		struct dc_state *dst_ctx)

{

	dst_ctx->dccg = dc->res_pool->clk_mgr;

	dst_ctx->clk_mgr = dc->res_pool->clk_mgr;

}



/**

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+2 −2
Original line number Diff line number Diff line
@@ -1166,8 +1166,8 @@ static void build_audio_output( 
	if (pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT ||

			pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {

		audio_output->pll_info.dp_dto_source_clock_in_khz =

				state->dccg->funcs->get_dp_ref_clk_frequency(

						state->dccg);

				state->clk_mgr->funcs->get_dp_ref_clk_frequency(

						state->clk_mgr);

	}



	audio_output->pll_info.feed_back_divider =

drivers/gpu/drm/amd/display/dc/inc/core_types.h

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ struct dc_state { 
	struct dcn_bw_internal_vars dcn_bw_vars;

#endif



	struct clk_mgr *dccg;

	struct clk_mgr *clk_mgr;



	struct {

		bool full_update_needed : 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE