Commit 110d3968 authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher
Browse files

drm/amd/display: Add DCN3.1 OPTC 



Add support for programming the DCN3.1 OPTC (Output Timing Controller)

HW Blocks:

    +--------+
    |  MPC   |
    +--------+
        |
        v
    +-------+
    |  OPP  |
    +-------+
        |
        v
    +--------+
    |  OPTC  |
    +--------+
        |
        v
    +--------+       +--------+
    |  DIO   |       |  DCCG  |
    +--------+       +--------+

There are no changes to OPP or MPC for DCN3.1, so the diagram will
include them in this patch.

Acked-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cbaf919f

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

+11 −0
Original line number Diff line number Diff line
@@ -968,6 +968,17 @@ void optc1_set_drr( 
	}

}



void optc1_set_vtotal_min_max(struct timing_generator *optc, int vtotal_min, int vtotal_max)

{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);



	REG_SET(OTG_V_TOTAL_MAX, 0,

		OTG_V_TOTAL_MAX, vtotal_max);



	REG_SET(OTG_V_TOTAL_MIN, 0,

		OTG_V_TOTAL_MIN, vtotal_min);

}



static void optc1_set_test_pattern(

	struct timing_generator *optc,

	/* TODO: replace 'controller_dp_test_pattern' by 'test_pattern_mode'

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

+2 −0
Original line number Diff line number Diff line
@@ -666,6 +666,8 @@ void optc1_set_drr( 
	struct timing_generator *optc,

	const struct drr_params *params);



void optc1_set_vtotal_min_max(struct timing_generator *optc, int vtotal_min, int vtotal_max);



void optc1_set_static_screen_control(

	struct timing_generator *optc,

	uint32_t event_triggers,

drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c

0 → 100644
+287 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012-15 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: AMD

 *

 */



#include "dcn31_optc.h"



#include "dcn30/dcn30_optc.h"

#include "reg_helper.h"

#include "dc.h"

#include "dcn_calc_math.h"



#define REG(reg)\

	optc1->tg_regs->reg



#define CTX \

	optc1->base.ctx



#undef FN

#define FN(reg_name, field_name) \

	optc1->tg_shift->field_name, optc1->tg_mask->field_name



static void optc31_set_odm_combine(struct timing_generator *optc, int *opp_id, int opp_cnt,

		struct dc_crtc_timing *timing)

{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);

	int mpcc_hactive = (timing->h_addressable + timing->h_border_left + timing->h_border_right)

			/ opp_cnt;

	uint32_t memory_mask = 0;

	int mem_count_per_opp = (mpcc_hactive + 2559) / 2560;



	/* Assume less than 6 pipes */

	if (opp_cnt == 4) {

		if (mem_count_per_opp == 1)

			memory_mask = 0xf;

		else {

			ASSERT(mem_count_per_opp == 2);

			memory_mask = 0xff;

		}

	} else if (mem_count_per_opp == 1)

		memory_mask = 0x1 << (opp_id[0] * 2) | 0x1 << (opp_id[1] * 2);

	else if (mem_count_per_opp == 2)

		memory_mask = 0x3 << (opp_id[0] * 2) | 0x3 << (opp_id[1] * 2);

	else if (mem_count_per_opp == 3)

		memory_mask = 0x77;

	else if (mem_count_per_opp == 4)

		memory_mask = 0xff;



	if (REG(OPTC_MEMORY_CONFIG))

		REG_SET(OPTC_MEMORY_CONFIG, 0,

			OPTC_MEM_SEL, memory_mask);



	if (opp_cnt == 2) {

		REG_SET_3(OPTC_DATA_SOURCE_SELECT, 0,

				OPTC_NUM_OF_INPUT_SEGMENT, 1,

				OPTC_SEG0_SRC_SEL, opp_id[0],

				OPTC_SEG1_SRC_SEL, opp_id[1]);

	} else if (opp_cnt == 4) {

		REG_SET_5(OPTC_DATA_SOURCE_SELECT, 0,

				OPTC_NUM_OF_INPUT_SEGMENT, 3,

				OPTC_SEG0_SRC_SEL, opp_id[0],

				OPTC_SEG1_SRC_SEL, opp_id[1],

				OPTC_SEG2_SRC_SEL, opp_id[2],

				OPTC_SEG3_SRC_SEL, opp_id[3]);

	}



	REG_UPDATE(OPTC_WIDTH_CONTROL,

			OPTC_SEGMENT_WIDTH, mpcc_hactive);



	REG_SET(OTG_H_TIMING_CNTL, 0, OTG_H_TIMING_DIV_MODE, opp_cnt - 1);

	optc1->opp_count = opp_cnt;

}



/**

 * Enable CRTC

 * Enable CRTC - call ASIC Control Object to enable Timing generator.

 */

static bool optc31_enable_crtc(struct timing_generator *optc)

{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);



	/* opp instance for OTG, 1 to 1 mapping and odm will adjust */

	REG_UPDATE(OPTC_DATA_SOURCE_SELECT,

			OPTC_SEG0_SRC_SEL, optc->inst);



	/* VTG enable first is for HW workaround */

	REG_UPDATE(CONTROL,

			VTG0_ENABLE, 1);



	REG_SEQ_START();



	/* Enable CRTC */

	REG_UPDATE_2(OTG_CONTROL,

			OTG_DISABLE_POINT_CNTL, 2,

			OTG_MASTER_EN, 1);



	REG_SEQ_SUBMIT();

	REG_SEQ_WAIT_DONE();



	return true;

}



/* disable_crtc - call ASIC Control Object to disable Timing generator. */

static bool optc31_disable_crtc(struct timing_generator *optc)

{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);



	/* disable otg request until end of the first line

	 * in the vertical blank region

	 */

	REG_UPDATE(OTG_CONTROL,

			OTG_MASTER_EN, 0);



	REG_UPDATE(CONTROL,

			VTG0_ENABLE, 0);



	/* CRTC disabled, so disable  clock. */

	REG_WAIT(OTG_CLOCK_CONTROL,

			OTG_BUSY, 0,

			1, 100000);



	return true;

}



static bool optc31_immediate_disable_crtc(struct timing_generator *optc)

{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);



	REG_UPDATE_2(OTG_CONTROL,

			OTG_DISABLE_POINT_CNTL, 0,

			OTG_MASTER_EN, 0);



	REG_UPDATE(CONTROL,

			VTG0_ENABLE, 0);



	/* CRTC disabled, so disable  clock. */

	REG_WAIT(OTG_CLOCK_CONTROL,

			OTG_BUSY, 0,

			1, 100000);



	return true;

}



static void optc31_set_drr(

	struct timing_generator *optc,

	const struct drr_params *params)

{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);



	if (params != NULL &&

		params->vertical_total_max > 0 &&

		params->vertical_total_min > 0) {



		if (params->vertical_total_mid != 0) {



			REG_SET(OTG_V_TOTAL_MID, 0,

				OTG_V_TOTAL_MID, params->vertical_total_mid - 1);



			REG_UPDATE_2(OTG_V_TOTAL_CONTROL,

					OTG_VTOTAL_MID_REPLACING_MAX_EN, 1,

					OTG_VTOTAL_MID_FRAME_NUM,

					(uint8_t)params->vertical_total_mid_frame_num);



		}



		optc->funcs->set_vtotal_min_max(optc, params->vertical_total_min - 1, params->vertical_total_max - 1);



		/*

		 * MIN_MASK_EN is gone and MASK is now always enabled.

		 *

		 * To get it to it work with manual trigger we need to make sure

		 * we program the correct bit.

		 */

		REG_UPDATE_4(OTG_V_TOTAL_CONTROL,

				OTG_V_TOTAL_MIN_SEL, 1,

				OTG_V_TOTAL_MAX_SEL, 1,

				OTG_FORCE_LOCK_ON_EVENT, 0,

				OTG_SET_V_TOTAL_MIN_MASK, (1 << 1)); /* TRIGA */



		// Setup manual flow control for EOF via TRIG_A

		optc->funcs->setup_manual_trigger(optc);



	} else {

		REG_UPDATE_4(OTG_V_TOTAL_CONTROL,

				OTG_SET_V_TOTAL_MIN_MASK, 0,

				OTG_V_TOTAL_MIN_SEL, 0,

				OTG_V_TOTAL_MAX_SEL, 0,

				OTG_FORCE_LOCK_ON_EVENT, 0);



		optc->funcs->set_vtotal_min_max(optc, 0, 0);

	}

}



static struct timing_generator_funcs dcn31_tg_funcs = {

		.validate_timing = optc1_validate_timing,

		.program_timing = optc1_program_timing,

		.setup_vertical_interrupt0 = optc1_setup_vertical_interrupt0,

		.setup_vertical_interrupt1 = optc1_setup_vertical_interrupt1,

		.setup_vertical_interrupt2 = optc1_setup_vertical_interrupt2,

		.program_global_sync = optc1_program_global_sync,

		.enable_crtc = optc31_enable_crtc,

		.disable_crtc = optc31_disable_crtc,

		.immediate_disable_crtc = optc31_immediate_disable_crtc,

		/* used by enable_timing_synchronization. Not need for FPGA */

		.is_counter_moving = optc1_is_counter_moving,

		.get_position = optc1_get_position,

		.get_frame_count = optc1_get_vblank_counter,

		.get_scanoutpos = optc1_get_crtc_scanoutpos,

		.get_otg_active_size = optc1_get_otg_active_size,

		.set_early_control = optc1_set_early_control,

		/* used by enable_timing_synchronization. Not need for FPGA */

		.wait_for_state = optc1_wait_for_state,

		.set_blank_color = optc3_program_blank_color,

		.did_triggered_reset_occur = optc1_did_triggered_reset_occur,

		.triplebuffer_lock = optc3_triplebuffer_lock,

		.triplebuffer_unlock = optc2_triplebuffer_unlock,

		.enable_reset_trigger = optc1_enable_reset_trigger,

		.enable_crtc_reset = optc1_enable_crtc_reset,

		.disable_reset_trigger = optc1_disable_reset_trigger,

		.lock = optc3_lock,

		.is_locked = optc1_is_locked,

		.unlock = optc1_unlock,

		.lock_doublebuffer_enable = optc3_lock_doublebuffer_enable,

		.lock_doublebuffer_disable = optc3_lock_doublebuffer_disable,

		.enable_optc_clock = optc1_enable_optc_clock,

		.set_drr = optc31_set_drr,

		.set_vtotal_min_max = optc1_set_vtotal_min_max,

		.set_static_screen_control = optc1_set_static_screen_control,

		.program_stereo = optc1_program_stereo,

		.is_stereo_left_eye = optc1_is_stereo_left_eye,

		.tg_init = optc3_tg_init,

		.is_tg_enabled = optc1_is_tg_enabled,

		.is_optc_underflow_occurred = optc1_is_optc_underflow_occurred,

		.clear_optc_underflow = optc1_clear_optc_underflow,

		.setup_global_swap_lock = NULL,

		.get_crc = optc1_get_crc,

		.configure_crc = optc2_configure_crc,

		.set_dsc_config = optc3_set_dsc_config,

		.set_dwb_source = NULL,

		.set_odm_bypass = optc3_set_odm_bypass,

		.set_odm_combine = optc31_set_odm_combine,

		.get_optc_source = optc2_get_optc_source,

		.set_out_mux = optc3_set_out_mux,

		.set_drr_trigger_window = optc3_set_drr_trigger_window,

		.set_vtotal_change_limit = optc3_set_vtotal_change_limit,

		.set_gsl = optc2_set_gsl,

		.set_gsl_source_select = optc2_set_gsl_source_select,

		.set_vtg_params = optc1_set_vtg_params,

		.program_manual_trigger = optc2_program_manual_trigger,

		.setup_manual_trigger = optc2_setup_manual_trigger,

		.get_hw_timing = optc1_get_hw_timing,

};



void dcn31_timing_generator_init(struct optc *optc1)

{

	optc1->base.funcs = &dcn31_tg_funcs;



	optc1->max_h_total = optc1->tg_mask->OTG_H_TOTAL + 1;

	optc1->max_v_total = optc1->tg_mask->OTG_V_TOTAL + 1;



	optc1->min_h_blank = 32;

	optc1->min_v_blank = 3;

	optc1->min_v_blank_interlace = 5;

	optc1->min_h_sync_width = 4;

	optc1->min_v_sync_width = 1;

}

drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h

0 → 100644
+259 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012-15 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: AMD

 *

 */



#ifndef __DC_OPTC_DCN31_H__

#define __DC_OPTC_DCN31_H__



#include "dcn10/dcn10_optc.h"



#define OPTC_COMMON_REG_LIST_DCN3_1(inst) \

	SRI(OTG_VSTARTUP_PARAM, OTG, inst),\

	SRI(OTG_VUPDATE_PARAM, OTG, inst),\

	SRI(OTG_VREADY_PARAM, OTG, inst),\

	SRI(OTG_MASTER_UPDATE_LOCK, OTG, inst),\

	SRI(OTG_GLOBAL_CONTROL0, OTG, inst),\

	SRI(OTG_GLOBAL_CONTROL1, OTG, inst),\

	SRI(OTG_GLOBAL_CONTROL2, OTG, inst),\

	SRI(OTG_GLOBAL_CONTROL4, OTG, inst),\

	SRI(OTG_DOUBLE_BUFFER_CONTROL, OTG, inst),\

	SRI(OTG_H_TOTAL, OTG, inst),\

	SRI(OTG_H_BLANK_START_END, OTG, inst),\

	SRI(OTG_H_SYNC_A, OTG, inst),\

	SRI(OTG_H_SYNC_A_CNTL, OTG, inst),\

	SRI(OTG_H_TIMING_CNTL, OTG, inst),\

	SRI(OTG_V_TOTAL, OTG, inst),\

	SRI(OTG_V_BLANK_START_END, OTG, inst),\

	SRI(OTG_V_SYNC_A, OTG, inst),\

	SRI(OTG_V_SYNC_A_CNTL, OTG, inst),\

	SRI(OTG_CONTROL, OTG, inst),\

	SRI(OTG_STEREO_CONTROL, OTG, inst),\

	SRI(OTG_3D_STRUCTURE_CONTROL, OTG, inst),\

	SRI(OTG_STEREO_STATUS, OTG, inst),\

	SRI(OTG_V_TOTAL_MAX, OTG, inst),\

	SRI(OTG_V_TOTAL_MIN, OTG, inst),\

	SRI(OTG_V_TOTAL_CONTROL, OTG, inst),\

	SRI(OTG_TRIGA_CNTL, OTG, inst),\

	SRI(OTG_FORCE_COUNT_NOW_CNTL, OTG, inst),\

	SRI(OTG_STATIC_SCREEN_CONTROL, OTG, inst),\

	SRI(OTG_STATUS_FRAME_COUNT, OTG, inst),\

	SRI(OTG_STATUS, OTG, inst),\

	SRI(OTG_STATUS_POSITION, OTG, inst),\

	SRI(OTG_NOM_VERT_POSITION, OTG, inst),\

	SRI(OTG_M_CONST_DTO0, OTG, inst),\

	SRI(OTG_M_CONST_DTO1, OTG, inst),\

	SRI(OTG_CLOCK_CONTROL, OTG, inst),\

	SRI(OTG_VERTICAL_INTERRUPT0_CONTROL, OTG, inst),\

	SRI(OTG_VERTICAL_INTERRUPT0_POSITION, OTG, inst),\

	SRI(OTG_VERTICAL_INTERRUPT1_CONTROL, OTG, inst),\

	SRI(OTG_VERTICAL_INTERRUPT1_POSITION, OTG, inst),\

	SRI(OTG_VERTICAL_INTERRUPT2_CONTROL, OTG, inst),\

	SRI(OTG_VERTICAL_INTERRUPT2_POSITION, OTG, inst),\

	SRI(OPTC_INPUT_CLOCK_CONTROL, ODM, inst),\

	SRI(OPTC_DATA_SOURCE_SELECT, ODM, inst),\

	SRI(OPTC_INPUT_GLOBAL_CONTROL, ODM, inst),\

	SRI(CONTROL, VTG, inst),\

	SRI(OTG_VERT_SYNC_CONTROL, OTG, inst),\

	SRI(OTG_GSL_CONTROL, OTG, inst),\

	SRI(OTG_CRC_CNTL, OTG, inst),\

	SRI(OTG_CRC0_DATA_RG, OTG, inst),\

	SRI(OTG_CRC0_DATA_B, OTG, inst),\

	SRI(OTG_CRC0_WINDOWA_X_CONTROL, OTG, inst),\

	SRI(OTG_CRC0_WINDOWA_Y_CONTROL, OTG, inst),\

	SRI(OTG_CRC0_WINDOWB_X_CONTROL, OTG, inst),\

	SRI(OTG_CRC0_WINDOWB_Y_CONTROL, OTG, inst),\

	SR(GSL_SOURCE_SELECT),\

	SRI(OTG_TRIGA_MANUAL_TRIG, OTG, inst),\

	SRI(OTG_GLOBAL_CONTROL1, OTG, inst),\

	SRI(OTG_GLOBAL_CONTROL2, OTG, inst),\

	SRI(OTG_GSL_WINDOW_X, OTG, inst),\

	SRI(OTG_GSL_WINDOW_Y, OTG, inst),\

	SRI(OTG_VUPDATE_KEEPOUT, OTG, inst),\

	SRI(OTG_DSC_START_POSITION, OTG, inst),\

	SRI(OTG_DRR_TRIGGER_WINDOW, OTG, inst),\

	SRI(OTG_DRR_V_TOTAL_CHANGE, OTG, inst),\

	SRI(OPTC_DATA_FORMAT_CONTROL, ODM, inst),\

	SRI(OPTC_BYTES_PER_PIXEL, ODM, inst),\

	SRI(OPTC_WIDTH_CONTROL, ODM, inst),\

	SRI(OPTC_MEMORY_CONFIG, ODM, inst),\

	SRI(OTG_CRC_CNTL2, OTG, inst),\

	SR(DWB_SOURCE_SELECT)



#define OPTC_COMMON_MASK_SH_LIST_DCN3_1(mask_sh)\

	SF(OTG0_OTG_VSTARTUP_PARAM, VSTARTUP_START, mask_sh),\

	SF(OTG0_OTG_VUPDATE_PARAM, VUPDATE_OFFSET, mask_sh),\

	SF(OTG0_OTG_VUPDATE_PARAM, VUPDATE_WIDTH, mask_sh),\

	SF(OTG0_OTG_VREADY_PARAM, VREADY_OFFSET, mask_sh),\

	SF(OTG0_OTG_MASTER_UPDATE_LOCK, OTG_MASTER_UPDATE_LOCK, mask_sh),\

	SF(OTG0_OTG_MASTER_UPDATE_LOCK, UPDATE_LOCK_STATUS, mask_sh),\

	SF(OTG0_OTG_GLOBAL_CONTROL0, MASTER_UPDATE_LOCK_DB_START_X, mask_sh),\

	SF(OTG0_OTG_GLOBAL_CONTROL0, MASTER_UPDATE_LOCK_DB_END_X, mask_sh),\

	SF(OTG0_OTG_GLOBAL_CONTROL0, MASTER_UPDATE_LOCK_DB_EN, mask_sh),\

	SF(OTG0_OTG_GLOBAL_CONTROL1, MASTER_UPDATE_LOCK_DB_START_Y, mask_sh),\

	SF(OTG0_OTG_GLOBAL_CONTROL1, MASTER_UPDATE_LOCK_DB_END_Y, mask_sh),\

	SF(OTG0_OTG_GLOBAL_CONTROL2, OTG_MASTER_UPDATE_LOCK_SEL, mask_sh),\

	SF(OTG0_OTG_GLOBAL_CONTROL4, DIG_UPDATE_POSITION_X, mask_sh),\

	SF(OTG0_OTG_GLOBAL_CONTROL4, DIG_UPDATE_POSITION_Y, mask_sh),\

	SF(OTG0_OTG_DOUBLE_BUFFER_CONTROL, OTG_UPDATE_PENDING, mask_sh),\

	SF(OTG0_OTG_H_TOTAL, OTG_H_TOTAL, mask_sh),\

	SF(OTG0_OTG_H_BLANK_START_END, OTG_H_BLANK_START, mask_sh),\

	SF(OTG0_OTG_H_BLANK_START_END, OTG_H_BLANK_END, mask_sh),\

	SF(OTG0_OTG_H_SYNC_A, OTG_H_SYNC_A_START, mask_sh),\

	SF(OTG0_OTG_H_SYNC_A, OTG_H_SYNC_A_END, mask_sh),\

	SF(OTG0_OTG_H_SYNC_A_CNTL, OTG_H_SYNC_A_POL, mask_sh),\

	SF(OTG0_OTG_V_TOTAL, OTG_V_TOTAL, mask_sh),\

	SF(OTG0_OTG_V_BLANK_START_END, OTG_V_BLANK_START, mask_sh),\

	SF(OTG0_OTG_V_BLANK_START_END, OTG_V_BLANK_END, mask_sh),\

	SF(OTG0_OTG_V_SYNC_A, OTG_V_SYNC_A_START, mask_sh),\

	SF(OTG0_OTG_V_SYNC_A, OTG_V_SYNC_A_END, mask_sh),\

	SF(OTG0_OTG_V_SYNC_A_CNTL, OTG_V_SYNC_A_POL, mask_sh),\

	SF(OTG0_OTG_V_SYNC_A_CNTL, OTG_V_SYNC_MODE, mask_sh),\

	SF(OTG0_OTG_CONTROL, OTG_MASTER_EN, mask_sh),\

	SF(OTG0_OTG_CONTROL, OTG_START_POINT_CNTL, mask_sh),\

	SF(OTG0_OTG_CONTROL, OTG_DISABLE_POINT_CNTL, mask_sh),\

	SF(OTG0_OTG_CONTROL, OTG_FIELD_NUMBER_CNTL, mask_sh),\

	SF(OTG0_OTG_CONTROL, OTG_OUT_MUX, mask_sh),\

	SF(OTG0_OTG_STEREO_CONTROL, OTG_STEREO_EN, mask_sh),\

	SF(OTG0_OTG_STEREO_CONTROL, OTG_STEREO_SYNC_OUTPUT_LINE_NUM, mask_sh),\

	SF(OTG0_OTG_STEREO_CONTROL, OTG_STEREO_SYNC_OUTPUT_POLARITY, mask_sh),\

	SF(OTG0_OTG_STEREO_CONTROL, OTG_STEREO_EYE_FLAG_POLARITY, mask_sh),\

	SF(OTG0_OTG_STEREO_CONTROL, OTG_DISABLE_STEREOSYNC_OUTPUT_FOR_DP, mask_sh),\

	SF(OTG0_OTG_STEREO_STATUS, OTG_STEREO_CURRENT_EYE, mask_sh),\

	SF(OTG0_OTG_3D_STRUCTURE_CONTROL, OTG_3D_STRUCTURE_EN, mask_sh),\

	SF(OTG0_OTG_3D_STRUCTURE_CONTROL, OTG_3D_STRUCTURE_V_UPDATE_MODE, mask_sh),\

	SF(OTG0_OTG_3D_STRUCTURE_CONTROL, OTG_3D_STRUCTURE_STEREO_SEL_OVR, mask_sh),\

	SF(OTG0_OTG_V_TOTAL_MAX, OTG_V_TOTAL_MAX, mask_sh),\

	SF(OTG0_OTG_V_TOTAL_MIN, OTG_V_TOTAL_MIN, mask_sh),\

	SF(OTG0_OTG_V_TOTAL_CONTROL, OTG_V_TOTAL_MIN_SEL, mask_sh),\

	SF(OTG0_OTG_V_TOTAL_CONTROL, OTG_V_TOTAL_MAX_SEL, mask_sh),\

	SF(OTG0_OTG_V_TOTAL_CONTROL, OTG_FORCE_LOCK_ON_EVENT, mask_sh),\

	SF(OTG0_OTG_V_TOTAL_CONTROL, OTG_SET_V_TOTAL_MIN_MASK, mask_sh),\

	SF(OTG0_OTG_V_TOTAL_CONTROL, OTG_VTOTAL_MID_REPLACING_MIN_EN, mask_sh),\

	SF(OTG0_OTG_V_TOTAL_CONTROL, OTG_VTOTAL_MID_REPLACING_MAX_EN, mask_sh),\

	SF(OTG0_OTG_FORCE_COUNT_NOW_CNTL, OTG_FORCE_COUNT_NOW_CLEAR, mask_sh),\

	SF(OTG0_OTG_FORCE_COUNT_NOW_CNTL, OTG_FORCE_COUNT_NOW_MODE, mask_sh),\

	SF(OTG0_OTG_FORCE_COUNT_NOW_CNTL, OTG_FORCE_COUNT_NOW_OCCURRED, mask_sh),\

	SF(OTG0_OTG_TRIGA_CNTL, OTG_TRIGA_SOURCE_SELECT, mask_sh),\

	SF(OTG0_OTG_TRIGA_CNTL, OTG_TRIGA_SOURCE_PIPE_SELECT, mask_sh),\

	SF(OTG0_OTG_TRIGA_CNTL, OTG_TRIGA_RISING_EDGE_DETECT_CNTL, mask_sh),\

	SF(OTG0_OTG_TRIGA_CNTL, OTG_TRIGA_FALLING_EDGE_DETECT_CNTL, mask_sh),\

	SF(OTG0_OTG_TRIGA_CNTL, OTG_TRIGA_POLARITY_SELECT, mask_sh),\

	SF(OTG0_OTG_TRIGA_CNTL, OTG_TRIGA_FREQUENCY_SELECT, mask_sh),\

	SF(OTG0_OTG_TRIGA_CNTL, OTG_TRIGA_DELAY, mask_sh),\

	SF(OTG0_OTG_TRIGA_CNTL, OTG_TRIGA_CLEAR, mask_sh),\

	SF(OTG0_OTG_STATIC_SCREEN_CONTROL, OTG_STATIC_SCREEN_EVENT_MASK, mask_sh),\

	SF(OTG0_OTG_STATIC_SCREEN_CONTROL, OTG_STATIC_SCREEN_FRAME_COUNT, mask_sh),\

	SF(OTG0_OTG_STATUS_FRAME_COUNT, OTG_FRAME_COUNT, mask_sh),\

	SF(OTG0_OTG_STATUS, OTG_V_BLANK, mask_sh),\

	SF(OTG0_OTG_STATUS, OTG_V_ACTIVE_DISP, mask_sh),\

	SF(OTG0_OTG_STATUS_POSITION, OTG_HORZ_COUNT, mask_sh),\

	SF(OTG0_OTG_STATUS_POSITION, OTG_VERT_COUNT, mask_sh),\

	SF(OTG0_OTG_NOM_VERT_POSITION, OTG_VERT_COUNT_NOM, mask_sh),\

	SF(OTG0_OTG_M_CONST_DTO0, OTG_M_CONST_DTO_PHASE, mask_sh),\

	SF(OTG0_OTG_M_CONST_DTO1, OTG_M_CONST_DTO_MODULO, mask_sh),\

	SF(OTG0_OTG_CLOCK_CONTROL, OTG_BUSY, mask_sh),\

	SF(OTG0_OTG_CLOCK_CONTROL, OTG_CLOCK_EN, mask_sh),\

	SF(OTG0_OTG_CLOCK_CONTROL, OTG_CLOCK_ON, mask_sh),\

	SF(OTG0_OTG_CLOCK_CONTROL, OTG_CLOCK_GATE_DIS, mask_sh),\

	SF(OTG0_OTG_VERTICAL_INTERRUPT0_CONTROL, OTG_VERTICAL_INTERRUPT0_INT_ENABLE, mask_sh),\

	SF(OTG0_OTG_VERTICAL_INTERRUPT0_POSITION, OTG_VERTICAL_INTERRUPT0_LINE_START, mask_sh),\

	SF(OTG0_OTG_VERTICAL_INTERRUPT0_POSITION, OTG_VERTICAL_INTERRUPT0_LINE_END, mask_sh),\

	SF(OTG0_OTG_VERTICAL_INTERRUPT1_CONTROL, OTG_VERTICAL_INTERRUPT1_INT_ENABLE, mask_sh),\

	SF(OTG0_OTG_VERTICAL_INTERRUPT1_POSITION, OTG_VERTICAL_INTERRUPT1_LINE_START, mask_sh),\

	SF(OTG0_OTG_VERTICAL_INTERRUPT2_CONTROL, OTG_VERTICAL_INTERRUPT2_INT_ENABLE, mask_sh),\

	SF(OTG0_OTG_VERTICAL_INTERRUPT2_POSITION, OTG_VERTICAL_INTERRUPT2_LINE_START, mask_sh),\

	SF(ODM0_OPTC_INPUT_CLOCK_CONTROL, OPTC_INPUT_CLK_EN, mask_sh),\

	SF(ODM0_OPTC_INPUT_CLOCK_CONTROL, OPTC_INPUT_CLK_ON, mask_sh),\

	SF(ODM0_OPTC_INPUT_CLOCK_CONTROL, OPTC_INPUT_CLK_GATE_DIS, mask_sh),\

	SF(ODM0_OPTC_INPUT_GLOBAL_CONTROL, OPTC_UNDERFLOW_OCCURRED_STATUS, mask_sh),\

	SF(ODM0_OPTC_INPUT_GLOBAL_CONTROL, OPTC_UNDERFLOW_CLEAR, mask_sh),\

	SF(VTG0_CONTROL, VTG0_ENABLE, mask_sh),\

	SF(VTG0_CONTROL, VTG0_FP2, mask_sh),\

	SF(VTG0_CONTROL, VTG0_VCOUNT_INIT, mask_sh),\

	SF(OTG0_OTG_VERT_SYNC_CONTROL, OTG_FORCE_VSYNC_NEXT_LINE_OCCURRED, mask_sh),\

	SF(OTG0_OTG_VERT_SYNC_CONTROL, OTG_FORCE_VSYNC_NEXT_LINE_CLEAR, mask_sh),\

	SF(OTG0_OTG_VERT_SYNC_CONTROL, OTG_AUTO_FORCE_VSYNC_MODE, mask_sh),\

	SF(OTG0_OTG_GSL_CONTROL, OTG_GSL0_EN, mask_sh),\

	SF(OTG0_OTG_GSL_CONTROL, OTG_GSL1_EN, mask_sh),\

	SF(OTG0_OTG_GSL_CONTROL, OTG_GSL2_EN, mask_sh),\

	SF(OTG0_OTG_GSL_CONTROL, OTG_GSL_MASTER_EN, mask_sh),\

	SF(OTG0_OTG_GSL_CONTROL, OTG_GSL_FORCE_DELAY, mask_sh),\

	SF(OTG0_OTG_GSL_CONTROL, OTG_GSL_CHECK_ALL_FIELDS, mask_sh),\

	SF(OTG0_OTG_CRC_CNTL, OTG_CRC_CONT_EN, mask_sh),\

	SF(OTG0_OTG_CRC_CNTL, OTG_CRC0_SELECT, mask_sh),\

	SF(OTG0_OTG_CRC_CNTL, OTG_CRC_EN, mask_sh),\

	SF(OTG0_OTG_CRC0_DATA_RG, CRC0_R_CR, mask_sh),\

	SF(OTG0_OTG_CRC0_DATA_RG, CRC0_G_Y, mask_sh),\

	SF(OTG0_OTG_CRC0_DATA_B, CRC0_B_CB, mask_sh),\

	SF(OTG0_OTG_CRC0_WINDOWA_X_CONTROL, OTG_CRC0_WINDOWA_X_START, mask_sh),\

	SF(OTG0_OTG_CRC0_WINDOWA_X_CONTROL, OTG_CRC0_WINDOWA_X_END, mask_sh),\

	SF(OTG0_OTG_CRC0_WINDOWA_Y_CONTROL, OTG_CRC0_WINDOWA_Y_START, mask_sh),\

	SF(OTG0_OTG_CRC0_WINDOWA_Y_CONTROL, OTG_CRC0_WINDOWA_Y_END, mask_sh),\

	SF(OTG0_OTG_CRC0_WINDOWB_X_CONTROL, OTG_CRC0_WINDOWB_X_START, mask_sh),\

	SF(OTG0_OTG_CRC0_WINDOWB_X_CONTROL, OTG_CRC0_WINDOWB_X_END, mask_sh),\

	SF(OTG0_OTG_CRC0_WINDOWB_Y_CONTROL, OTG_CRC0_WINDOWB_Y_START, mask_sh),\

	SF(OTG0_OTG_CRC0_WINDOWB_Y_CONTROL, OTG_CRC0_WINDOWB_Y_END, mask_sh),\

	SF(OTG0_OTG_TRIGA_MANUAL_TRIG, OTG_TRIGA_MANUAL_TRIG, mask_sh),\

	SF(GSL_SOURCE_SELECT, GSL0_READY_SOURCE_SEL, mask_sh),\

	SF(GSL_SOURCE_SELECT, GSL1_READY_SOURCE_SEL, mask_sh),\

	SF(GSL_SOURCE_SELECT, GSL2_READY_SOURCE_SEL, mask_sh),\

	SF(OTG0_OTG_GLOBAL_CONTROL2, MANUAL_FLOW_CONTROL_SEL, mask_sh),\

	SF(OTG0_OTG_GLOBAL_CONTROL2, GLOBAL_UPDATE_LOCK_EN, mask_sh),\

	SF(OTG0_OTG_GSL_WINDOW_X, OTG_GSL_WINDOW_START_X, mask_sh),\

	SF(OTG0_OTG_GSL_WINDOW_X, OTG_GSL_WINDOW_END_X, mask_sh), \

	SF(OTG0_OTG_GSL_WINDOW_Y, OTG_GSL_WINDOW_START_Y, mask_sh),\

	SF(OTG0_OTG_GSL_WINDOW_Y, OTG_GSL_WINDOW_END_Y, mask_sh),\

	SF(OTG0_OTG_VUPDATE_KEEPOUT, OTG_MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_EN, mask_sh), \

	SF(OTG0_OTG_VUPDATE_KEEPOUT, MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_START_OFFSET, mask_sh), \

	SF(OTG0_OTG_VUPDATE_KEEPOUT, MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_END_OFFSET, mask_sh), \

	SF(OTG0_OTG_GSL_CONTROL, OTG_GSL_MASTER_MODE, mask_sh), \

	SF(OTG0_OTG_GSL_CONTROL, OTG_MASTER_UPDATE_LOCK_GSL_EN, mask_sh), \

	SF(OTG0_OTG_DSC_START_POSITION, OTG_DSC_START_POSITION_X, mask_sh), \

	SF(OTG0_OTG_DSC_START_POSITION, OTG_DSC_START_POSITION_LINE_NUM, mask_sh),\

	SF(ODM0_OPTC_DATA_SOURCE_SELECT, OPTC_SEG0_SRC_SEL, mask_sh),\

	SF(ODM0_OPTC_DATA_SOURCE_SELECT, OPTC_SEG1_SRC_SEL, mask_sh),\

	SF(ODM0_OPTC_DATA_SOURCE_SELECT, OPTC_SEG2_SRC_SEL, mask_sh),\

	SF(ODM0_OPTC_DATA_SOURCE_SELECT, OPTC_SEG3_SRC_SEL, mask_sh),\

	SF(ODM0_OPTC_DATA_SOURCE_SELECT, OPTC_NUM_OF_INPUT_SEGMENT, mask_sh),\

	SF(ODM0_OPTC_MEMORY_CONFIG, OPTC_MEM_SEL, mask_sh),\

	SF(ODM0_OPTC_DATA_FORMAT_CONTROL, OPTC_DATA_FORMAT, mask_sh),\

	SF(ODM0_OPTC_DATA_FORMAT_CONTROL, OPTC_DSC_MODE, mask_sh),\

	SF(ODM0_OPTC_BYTES_PER_PIXEL, OPTC_DSC_BYTES_PER_PIXEL, mask_sh),\

	SF(ODM0_OPTC_WIDTH_CONTROL, OPTC_DSC_SLICE_WIDTH, mask_sh),\

	SF(ODM0_OPTC_WIDTH_CONTROL, OPTC_SEGMENT_WIDTH, mask_sh),\

	SF(DWB_SOURCE_SELECT, OPTC_DWB0_SOURCE_SELECT, mask_sh),\

	SF(DWB_SOURCE_SELECT, OPTC_DWB1_SOURCE_SELECT, mask_sh),\

	SF(OTG0_OTG_DRR_TRIGGER_WINDOW, OTG_DRR_TRIGGER_WINDOW_START_X, mask_sh),\

	SF(OTG0_OTG_DRR_TRIGGER_WINDOW, OTG_DRR_TRIGGER_WINDOW_END_X, mask_sh),\

	SF(OTG0_OTG_DRR_V_TOTAL_CHANGE, OTG_DRR_V_TOTAL_CHANGE_LIMIT, mask_sh),\

	SF(OTG0_OTG_H_TIMING_CNTL, OTG_H_TIMING_DIV_MODE, mask_sh),\

	SF(OTG0_OTG_DOUBLE_BUFFER_CONTROL, OTG_DRR_TIMING_DBUF_UPDATE_MODE, mask_sh),\

	SF(OTG0_OTG_CRC_CNTL2, OTG_CRC_DSC_MODE, mask_sh),\

	SF(OTG0_OTG_CRC_CNTL2, OTG_CRC_DATA_STREAM_COMBINE_MODE, mask_sh),\

	SF(OTG0_OTG_CRC_CNTL2, OTG_CRC_DATA_STREAM_SPLIT_MODE, mask_sh),\

	SF(OTG0_OTG_CRC_CNTL2, OTG_CRC_DATA_FORMAT, mask_sh)



void dcn31_timing_generator_init(struct optc *optc1);



#endif /* __DC_OPTC_DCN31_H__ */

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

+4 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ struct timing_generator_funcs { 


	bool (*enable_crtc)(struct timing_generator *tg);

	bool (*disable_crtc)(struct timing_generator *tg);

#if defined(CONFIG_DRM_AMD_DC_DCN3_1)

	bool (*immediate_disable_crtc)(struct timing_generator *tg);

#endif

	bool (*is_counter_moving)(struct timing_generator *tg);

	void (*get_position)(struct timing_generator *tg,

				struct crtc_position *position);
@@ -223,6 +226,7 @@ struct timing_generator_funcs { 
	void (*enable_advanced_request)(struct timing_generator *tg,

					bool enable, const struct dc_crtc_timing *timing);

	void (*set_drr)(struct timing_generator *tg, const struct drr_params *params);

	void (*set_vtotal_min_max)(struct timing_generator *optc, int vtotal_min, int vtotal_max);

	void (*set_static_screen_control)(struct timing_generator *tg,

						uint32_t event_triggers,

						uint32_t num_frames);