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

Commit 40e045a9 authored by Yue Hin Lau's avatar Yue Hin Lau Committed by Alex Deucher
Browse files

drm/amd/display: OPTC cleanup/implementation 



Signed-off-by: default avatarYue Hin Lau <Yuehin.Lau@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 79086a55

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

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ void dcn10_log_hw_state(struct dc *dc) 
		struct timing_generator *tg = pool->timing_generators[i];

		struct dcn_otg_state s = {0};



		tgn10_read_otg_state(DCN10TG_FROM_TG(tg), &s);

		optc1_read_otg_state(DCN10TG_FROM_TG(tg), &s);



		//only print if OTG master is enabled

		if ((s.otg_enabled & 1) == 0)

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

+5 −5
Original line number Diff line number Diff line
@@ -348,18 +348,18 @@ static const struct dcn_mpc_mask mpc_mask = { 
#define tg_regs(id)\

[id] = {TG_COMMON_REG_LIST_DCN1_0(id)}



static const struct dcn_tg_registers tg_regs[] = {

static const struct dcn_optc_registers tg_regs[] = {

	tg_regs(0),

	tg_regs(1),

	tg_regs(2),

	tg_regs(3),

};



static const struct dcn_tg_shift tg_shift = {

static const struct dcn_optc_shift tg_shift = {

	TG_COMMON_MASK_SH_LIST_DCN1_0(__SHIFT)

};



static const struct dcn_tg_mask tg_mask = {

static const struct dcn_optc_mask tg_mask = {

	TG_COMMON_MASK_SH_LIST_DCN1_0(_MASK)

};
@@ -553,8 +553,8 @@ static struct timing_generator *dcn10_timing_generator_create( 
		struct dc_context *ctx,

		uint32_t instance)

{

	struct dcn10_timing_generator *tgn10 =

		kzalloc(sizeof(struct dcn10_timing_generator), GFP_KERNEL);

	struct optc *tgn10 =

		kzalloc(sizeof(struct optc), GFP_KERNEL);



	if (!tgn10)

		return NULL;

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

+158 −158

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.h

+80 −10

File changed.

Preview size limit exceeded, changes collapsed.