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

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

drm/amd/display: Move OPP mpc tree initialization to hw_init 



Move OPP initialization of mpc tree parameters to hw_init function.

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 043b19bd

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

+2 −0
Original line number Diff line number Diff line
@@ -782,6 +782,8 @@ static void dcn10_init_hw(struct dc *dc) 
		hubp->opp_id = 0xf;

		hubp->power_gated = false;



		dc->res_pool->opps[i]->mpc_tree_params.opp_id = dc->res_pool->opps[i]->inst;

		dc->res_pool->opps[i]->mpc_tree_params.opp_list = NULL;

		dc->res_pool->opps[i]->mpcc_disconnect_pending[i] = true;

		pipe_ctx->stream_res.opp = dc->res_pool->opps[i];

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

+0 −7
Original line number Diff line number Diff line
@@ -330,18 +330,11 @@ void dcn10_opp_construct(struct dcn10_opp *oppn10, 
	const struct dcn10_opp_shift *opp_shift,

	const struct dcn10_opp_mask *opp_mask)

{

	int i;



	oppn10->base.ctx = ctx;

	oppn10->base.inst = inst;

	oppn10->base.funcs = &dcn10_opp_funcs;



	oppn10->base.mpc_tree_params.opp_id = inst;

	oppn10->base.mpc_tree_params.opp_list = NULL;



	for (i = 0; i < MAX_PIPES; i++)

		oppn10->base.mpcc_disconnect_pending[i] = false;



	oppn10->regs = regs;

	oppn10->opp_shift = opp_shift;

	oppn10->opp_mask = opp_mask;

drivers/gpu/drm/amd/display/dc/inc/hw/opp.h

+1 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ struct opp_funcs { 
		struct output_pixel_processor *opp,

		bool enable,

		bool polarity);



};



#endif