Commit 7801f3b7 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/display: prefer dig_port to reference intel_digital_port 



We have a mix of dport, intel_dport, intel_dig_port and dig_port to
reference a intel_digital_port struct. Numbers are around

5	intel_dport
36	dport
479	intel_dig_port
352	dig_port

Since we already removed the intel_ prefix from most of our other
structs, do the same here and prefer dig_port.

v2: rename everything in i915, not just a few display sources and
reword commit message (from Matt Roper)

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200701045054.23357-1-lucas.demarchi@intel.com
parent d524b87f

drivers/gpu/drm/i915/display/intel_ddi.c

+70 −73
Original line number Diff line number Diff line
@@ -1394,10 +1394,9 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, 
static void intel_ddi_init_dp_buf_reg(struct intel_encoder *encoder)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

	struct intel_digital_port *intel_dig_port =

		enc_to_dig_port(encoder);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);



	intel_dp->DP = intel_dig_port->saved_port_bits |

	intel_dp->DP = dig_port->saved_port_bits |

		DDI_BUF_CTL_ENABLE | DDI_BUF_TRANS_SELECT(0);

	intel_dp->DP |= DDI_PORT_WIDTH(intel_dp->lane_count);

}
@@ -2070,7 +2069,7 @@ static void _skl_ddi_set_iboost(struct drm_i915_private *dev_priv, 
static void skl_ddi_set_iboost(struct intel_encoder *encoder,

			       int level, enum intel_output_type type)

{

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	enum port port = encoder->port;

	u8 iboost;
@@ -2107,7 +2106,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, 


	_skl_ddi_set_iboost(dev_priv, port, iboost);



	if (port == PORT_A && intel_dig_port->max_lanes == 4)

	if (port == PORT_A && dig_port->max_lanes == 4)

		_skl_ddi_set_iboost(dev_priv, PORT_E, iboost);

}
@@ -3000,15 +2999,15 @@ static void intel_ddi_clk_disable(struct intel_encoder *encoder) 
}



static void

icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port,

icl_program_mg_dp_mode(struct intel_digital_port *dig_port,

		       const struct intel_crtc_state *crtc_state)

{

	struct drm_i915_private *dev_priv = to_i915(intel_dig_port->base.base.dev);

	enum tc_port tc_port = intel_port_to_tc(dev_priv, intel_dig_port->base.port);

	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);

	enum tc_port tc_port = intel_port_to_tc(dev_priv, dig_port->base.port);

	u32 ln0, ln1, pin_assignment;

	u8 width;



	if (intel_dig_port->tc_mode == TC_PORT_TBT_ALT)

	if (dig_port->tc_mode == TC_PORT_TBT_ALT)

		return;



	if (INTEL_GEN(dev_priv) >= 12) {
@@ -3027,13 +3026,13 @@ icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port, 
	ln1 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE);



	/* DPPATC */

	pin_assignment = intel_tc_port_get_pin_assignment_mask(intel_dig_port);

	pin_assignment = intel_tc_port_get_pin_assignment_mask(dig_port);

	width = crtc_state->lane_count;



	switch (pin_assignment) {

	case 0x0:

		drm_WARN_ON(&dev_priv->drm,

			    intel_dig_port->tc_mode != TC_PORT_LEGACY);

			    dig_port->tc_mode != TC_PORT_LEGACY);

		if (width == 1) {

			ln1 |= MG_DP_MODE_CFG_DP_X1_MODE;

		} else {
@@ -3978,10 +3977,9 @@ intel_ddi_pre_pll_enable(struct intel_atomic_state *state, 


static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)

{

	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);

	struct drm_i915_private *dev_priv =

		to_i915(intel_dig_port->base.base.dev);

	enum port port = intel_dig_port->base.port;

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);

	enum port port = dig_port->base.port;

	u32 dp_tp_ctl, ddi_buf_ctl;

	bool wait = false;
@@ -4536,42 +4534,41 @@ static const struct drm_encoder_funcs intel_ddi_funcs = { 
};



static struct intel_connector *

intel_ddi_init_dp_connector(struct intel_digital_port *intel_dig_port)

intel_ddi_init_dp_connector(struct intel_digital_port *dig_port)

{

	struct drm_i915_private *dev_priv = to_i915(intel_dig_port->base.base.dev);

	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);

	struct intel_connector *connector;

	enum port port = intel_dig_port->base.port;

	enum port port = dig_port->base.port;



	connector = intel_connector_alloc();

	if (!connector)

		return NULL;



	intel_dig_port->dp.output_reg = DDI_BUF_CTL(port);

	intel_dig_port->dp.prepare_link_retrain =

		intel_ddi_prepare_link_retrain;

	intel_dig_port->dp.set_link_train = intel_ddi_set_link_train;

	intel_dig_port->dp.set_idle_link_train = intel_ddi_set_idle_link_train;

	dig_port->dp.output_reg = DDI_BUF_CTL(port);

	dig_port->dp.prepare_link_retrain = intel_ddi_prepare_link_retrain;

	dig_port->dp.set_link_train = intel_ddi_set_link_train;

	dig_port->dp.set_idle_link_train = intel_ddi_set_idle_link_train;



	if (INTEL_GEN(dev_priv) >= 12)

		intel_dig_port->dp.set_signal_levels = tgl_set_signal_levels;

		dig_port->dp.set_signal_levels = tgl_set_signal_levels;

	else if (INTEL_GEN(dev_priv) >= 11)

		intel_dig_port->dp.set_signal_levels = icl_set_signal_levels;

		dig_port->dp.set_signal_levels = icl_set_signal_levels;

	else if (IS_CANNONLAKE(dev_priv))

		intel_dig_port->dp.set_signal_levels = cnl_set_signal_levels;

		dig_port->dp.set_signal_levels = cnl_set_signal_levels;

	else if (IS_GEN9_LP(dev_priv))

		intel_dig_port->dp.set_signal_levels = bxt_set_signal_levels;

		dig_port->dp.set_signal_levels = bxt_set_signal_levels;

	else

		intel_dig_port->dp.set_signal_levels = hsw_set_signal_levels;

		dig_port->dp.set_signal_levels = hsw_set_signal_levels;



	intel_dig_port->dp.voltage_max = intel_ddi_dp_voltage_max;

	intel_dig_port->dp.preemph_max = intel_ddi_dp_preemph_max;

	dig_port->dp.voltage_max = intel_ddi_dp_voltage_max;

	dig_port->dp.preemph_max = intel_ddi_dp_preemph_max;



	if (INTEL_GEN(dev_priv) < 12) {

		intel_dig_port->dp.regs.dp_tp_ctl = DP_TP_CTL(port);

		intel_dig_port->dp.regs.dp_tp_status = DP_TP_STATUS(port);

		dig_port->dp.regs.dp_tp_ctl = DP_TP_CTL(port);

		dig_port->dp.regs.dp_tp_status = DP_TP_STATUS(port);

	}



	if (!intel_dp_init_connector(intel_dig_port, connector)) {

	if (!intel_dp_init_connector(dig_port, connector)) {

		kfree(connector);

		return NULL;

	}
@@ -4770,29 +4767,29 @@ static bool bdw_digital_port_connected(struct intel_encoder *encoder) 
}



static struct intel_connector *

intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)

intel_ddi_init_hdmi_connector(struct intel_digital_port *dig_port)

{

	struct intel_connector *connector;

	enum port port = intel_dig_port->base.port;

	enum port port = dig_port->base.port;



	connector = intel_connector_alloc();

	if (!connector)

		return NULL;



	intel_dig_port->hdmi.hdmi_reg = DDI_BUF_CTL(port);

	intel_hdmi_init_connector(intel_dig_port, connector);

	dig_port->hdmi.hdmi_reg = DDI_BUF_CTL(port);

	intel_hdmi_init_connector(dig_port, connector);



	return connector;

}



static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dport)

static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port)

{

	struct drm_i915_private *dev_priv = to_i915(dport->base.base.dev);

	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);



	if (dport->base.port != PORT_A)

	if (dig_port->base.port != PORT_A)

		return false;



	if (dport->saved_port_bits & DDI_A_4_LANES)

	if (dig_port->saved_port_bits & DDI_A_4_LANES)

		return false;



	/* Broxton/Geminilake: Bspec says that DDI_A_4_LANES is the only
@@ -4814,10 +4811,10 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dport) 
}



static int

intel_ddi_max_lanes(struct intel_digital_port *intel_dport)

intel_ddi_max_lanes(struct intel_digital_port *dig_port)

{

	struct drm_i915_private *dev_priv = to_i915(intel_dport->base.base.dev);

	enum port port = intel_dport->base.port;

	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);

	enum port port = dig_port->base.port;

	int max_lanes = 4;



	if (INTEL_GEN(dev_priv) >= 11)
@@ -4836,10 +4833,10 @@ intel_ddi_max_lanes(struct intel_digital_port *intel_dport) 
	 * wasn't lit up at boot.  Force this bit set when needed

	 * so we use the proper lane count for our calculations.

	 */

	if (intel_ddi_a_force_4_lanes(intel_dport)) {

	if (intel_ddi_a_force_4_lanes(dig_port)) {

		drm_dbg_kms(&dev_priv->drm,

			    "Forcing DDI_A_4_LANES for port A\n");

		intel_dport->saved_port_bits |= DDI_A_4_LANES;

		dig_port->saved_port_bits |= DDI_A_4_LANES;

		max_lanes = 4;

	}
@@ -4848,7 +4845,7 @@ intel_ddi_max_lanes(struct intel_digital_port *intel_dport) 


void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)

{

	struct intel_digital_port *intel_dig_port;

	struct intel_digital_port *dig_port;

	struct intel_encoder *encoder;

	bool init_hdmi, init_dp, init_lspcon = false;

	enum phy phy = intel_port_to_phy(dev_priv, port);
@@ -4877,11 +4874,11 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) 
		return;

	}



	intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);

	if (!intel_dig_port)

	dig_port = kzalloc(sizeof(*dig_port), GFP_KERNEL);

	if (!dig_port)

		return;



	encoder = &intel_dig_port->base;

	encoder = &dig_port->base;



	drm_encoder_init(&dev_priv->drm, &encoder->base, &intel_ddi_funcs,

			 DRM_MODE_ENCODER_TMDS, "DDI %c", port_name(port));
@@ -4908,49 +4905,49 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) 
	encoder->pipe_mask = ~0;



	if (INTEL_GEN(dev_priv) >= 11)

		intel_dig_port->saved_port_bits = intel_de_read(dev_priv,

								DDI_BUF_CTL(port)) &

			DDI_BUF_PORT_REVERSAL;

		dig_port->saved_port_bits =

			intel_de_read(dev_priv, DDI_BUF_CTL(port))

			& DDI_BUF_PORT_REVERSAL;

	else

		intel_dig_port->saved_port_bits = intel_de_read(dev_priv,

								DDI_BUF_CTL(port)) &

			(DDI_BUF_PORT_REVERSAL | DDI_A_4_LANES);

		dig_port->saved_port_bits =

			intel_de_read(dev_priv, DDI_BUF_CTL(port))

			& (DDI_BUF_PORT_REVERSAL | DDI_A_4_LANES);



	intel_dig_port->dp.output_reg = INVALID_MMIO_REG;

	intel_dig_port->max_lanes = intel_ddi_max_lanes(intel_dig_port);

	intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);

	dig_port->dp.output_reg = INVALID_MMIO_REG;

	dig_port->max_lanes = intel_ddi_max_lanes(dig_port);

	dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);



	if (intel_phy_is_tc(dev_priv, phy)) {

		bool is_legacy =

			!intel_bios_port_supports_typec_usb(dev_priv, port) &&

			!intel_bios_port_supports_tbt(dev_priv, port);



		intel_tc_port_init(intel_dig_port, is_legacy);

		intel_tc_port_init(dig_port, is_legacy);



		encoder->update_prepare = intel_ddi_update_prepare;

		encoder->update_complete = intel_ddi_update_complete;

	}



	drm_WARN_ON(&dev_priv->drm, port > PORT_I);

	intel_dig_port->ddi_io_power_domain = POWER_DOMAIN_PORT_DDI_A_IO +

	dig_port->ddi_io_power_domain = POWER_DOMAIN_PORT_DDI_A_IO +

					      port - PORT_A;



	if (init_dp) {

		if (!intel_ddi_init_dp_connector(intel_dig_port))

		if (!intel_ddi_init_dp_connector(dig_port))

			goto err;



		intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;

		dig_port->hpd_pulse = intel_dp_hpd_pulse;

	}



	/* In theory we don't need the encoder->type check, but leave it just in

	 * case we have some really bad VBTs... */

	if (encoder->type != INTEL_OUTPUT_EDP && init_hdmi) {

		if (!intel_ddi_init_hdmi_connector(intel_dig_port))

		if (!intel_ddi_init_hdmi_connector(dig_port))

			goto err;

	}



	if (init_lspcon) {

		if (lspcon_init(intel_dig_port))

		if (lspcon_init(dig_port))

			/* TODO: handle hdmi info frame part */

			drm_dbg_kms(&dev_priv->drm,

				    "LSPCON init success on port %c\n",
@@ -4967,26 +4964,26 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) 


	if (INTEL_GEN(dev_priv) >= 11) {

		if (intel_phy_is_tc(dev_priv, phy))

			intel_dig_port->connected = intel_tc_port_connected;

			dig_port->connected = intel_tc_port_connected;

		else

			intel_dig_port->connected = lpt_digital_port_connected;

			dig_port->connected = lpt_digital_port_connected;

	} else if (INTEL_GEN(dev_priv) >= 8) {

		if (port == PORT_A || IS_GEN9_LP(dev_priv))

			intel_dig_port->connected = bdw_digital_port_connected;

			dig_port->connected = bdw_digital_port_connected;

		else

			intel_dig_port->connected = lpt_digital_port_connected;

			dig_port->connected = lpt_digital_port_connected;

	} else {

		if (port == PORT_A)

			intel_dig_port->connected = hsw_digital_port_connected;

			dig_port->connected = hsw_digital_port_connected;

		else

			intel_dig_port->connected = lpt_digital_port_connected;

			dig_port->connected = lpt_digital_port_connected;

	}



	intel_infoframe_init(intel_dig_port);

	intel_infoframe_init(dig_port);



	return;



err:

	drm_encoder_cleanup(&encoder->base);

	kfree(intel_dig_port);

	kfree(dig_port);

}

drivers/gpu/drm/i915/display/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -1612,13 +1612,13 @@ static void chv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe) 
}















void vlv_wait_port_ready(struct drm_i915_private *dev_priv,













			 struct intel_digital_port *dport,













			 struct intel_digital_port *dig_port,















			 unsigned int expected_mask)















{















	u32 port_mask;















	i915_reg_t dpll_reg;



























	switch (dport->base.port) {













	switch (dig_port->base.port) {















	case PORT_B:















		port_mask = DPLL_PORTB_READY_MASK;















		dpll_reg = DPLL(0);









@@ -1640,7 +1640,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,













				       port_mask, expected_mask, 1000))















		drm_WARN(&dev_priv->drm, 1,















			 "timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n",













			 dport->base.base.base.id, dport->base.base.name,













			 dig_port->base.base.base.id, dig_port->base.base.name,















			 intel_de_read(dev_priv, dpll_reg) & port_mask,















			 expected_mask);















}

































drivers/gpu/drm/i915/display/intel_display.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -542,7 +542,7 @@ void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state);





























int ilk_get_lanes_required(int target_clock, int link_bw, int bpp);















void vlv_wait_port_ready(struct drm_i915_private *dev_priv,













			 struct intel_digital_port *dport,













			 struct intel_digital_port *dig_port,















			 unsigned int expected_mask);















int intel_get_load_detect_pipe(struct drm_connector *connector,















			       struct intel_load_detect_pipe *old,

































drivers/gpu/drm/i915/display/intel_display_debugfs.c



+6
−6






























Original line number
Diff line number
Diff line








@@ -1194,7 +1194,7 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)













	struct drm_i915_private *dev_priv = node_to_i915(m->private);















	struct drm_device *dev = &dev_priv->drm;















	struct intel_encoder *intel_encoder;













	struct intel_digital_port *intel_dig_port;













	struct intel_digital_port *dig_port;















	struct drm_connector *connector;















	struct drm_connector_list_iter conn_iter;

























@@ -1207,14 +1207,14 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)













		if (!intel_encoder || intel_encoder->type == INTEL_OUTPUT_DP_MST)















			continue;





























		intel_dig_port = enc_to_dig_port(intel_encoder);













		if (!intel_dig_port->dp.can_mst)













		dig_port = enc_to_dig_port(intel_encoder);













		if (!dig_port->dp.can_mst)















			continue;































		seq_printf(m, "MST Source Port [ENCODER:%d:%s]\n",













			   intel_dig_port->base.base.base.id,













			   intel_dig_port->base.base.name);













		drm_dp_mst_dump_topology(m, &intel_dig_port->dp.mst_mgr);













			   dig_port->base.base.base.id,













			   dig_port->base.base.name);













		drm_dp_mst_dump_topology(m, &dig_port->dp.mst_mgr);















	}















	drm_connector_list_iter_end(&conn_iter);

















































drivers/gpu/drm/i915/display/intel_display_power.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -1817,8 +1817,8 @@ void chv_phy_powergate_lanes(struct intel_encoder *encoder,













{















	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);















	struct i915_power_domains *power_domains = &dev_priv->power_domains;













	enum dpio_phy phy = vlv_dport_to_phy(enc_to_dig_port(encoder));













	enum dpio_channel ch = vlv_dport_to_channel(enc_to_dig_port(encoder));













	enum dpio_phy phy = vlv_dig_port_to_phy(enc_to_dig_port(encoder));













	enum dpio_channel ch = vlv_dig_port_to_channel(enc_to_dig_port(encoder));































	mutex_lock(&power_domains->lock);

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE