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

Commit dc88b4a6 authored by Eric Yang's avatar Eric Yang Committed by Alex Deucher
Browse files

drm/amd/display: make clk mgr soc specific 



[Why]
First step of refactoring clk mgr to better handle different
ways of handling clock operations. Clock operation policies are
soc specific and not just DCN vesion specific. It is not a hw resource,
should not be in the resource pool.

[How]
Change clock manager creation to be based on HW internal ID, rename
clock manager members to be more clear. Move clock manager out of
resource.

Signed-off-by: default avatarEric Yang <Eric.Yang2@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 789142eb

drivers/gpu/drm/amd/display/dc/calcs/dcn_calc_auto.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#ifndef _DCN_CALC_AUTO_H_

#define _DCN_CALC_AUTO_H_



#include "dc.h"

#include "dcn_calcs.h"



void scaler_settings_calculation(struct dcn_bw_internal_vars *v);

drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c

+1 −2
Original line number Diff line number Diff line
@@ -24,11 +24,10 @@ 
 */



#include "dm_services.h"

#include "dc.h"

#include "dcn_calcs.h"

#include "dcn_calc_auto.h"

#include "dc.h"

#include "dal_asic_id.h"



#include "resource.h"

#include "dcn10/dcn10_resource.h"

#include "dcn10/dcn10_hubbub.h"

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

+10 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include "resource.h"



#include "clk_mgr.h"

#include "clock_source.h"

#include "dc_bios_types.h"
@@ -618,6 +619,11 @@ static void destruct(struct dc *dc) 


	destroy_links(dc);



	if (dc->clk_mgr) {

		dc_destroy_clk_mgr(dc->clk_mgr);

		dc->clk_mgr = NULL;

	}



	dc_destroy_resource_pool(dc);



	if (dc->ctx->gpio_service)
@@ -761,6 +767,10 @@ static bool construct(struct dc *dc, 
	if (!dc->res_pool)

		goto fail;



	dc->clk_mgr = dc_clk_mgr_create(dc->ctx, dc->res_pool->pp_smu, dc->res_pool->dccg);

	if (!dc->clk_mgr)

		goto fail;



	/* Creation of current_state must occur after dc->dml

	 * is initialized in dc_create_resource_pool because

	 * on creation it copies the contents of dc->dml

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

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "fixed31_32.h"

#include "dpcd_defs.h"

#include "dmcu.h"

#include "hw/clk_mgr.h"



#define DC_LOGGER_INIT(logger)

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

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

		struct dc_state *dst_ctx)

{

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

	dst_ctx->clk_mgr = dc->clk_mgr;

}



/**