Commit b7d02c3a authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass intel_encoder to enc_to_*() 



Lots of enc_to_foo(&encoder->base) around. Simplify by passing
in the intel_encoder instead.

@find@
identifier F =~ "^enc_to_.*";
identifier E;
@@
F(struct drm_encoder *E)
{
...
}

@@
identifier find.F;
identifier find.E;
@@
F(
- struct drm_encoder *E
+ struct intel_encoder *encoder
  )
{
<...
- E
+ &encoder->base
...>
}

@@
identifier find.F;
expression E;
@@
- F(E)
+ F(to_intel_encoder(E))

@@
expression E;
@@
- to_intel_encoder(&E->base)
+ E

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191204180549.1267-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
parent 43a6d19c

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

+31 −30
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static enum transcoder dsi_port_to_transcoder(enum port port) 
static void wait_for_cmds_dispatched_to_panel(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	struct mipi_dsi_device *dsi;

	enum port port;

	enum transcoder dsi_trans;
@@ -202,7 +202,7 @@ static int dsi_send_pkt_payld(struct intel_dsi_host *host, 
static void dsi_program_swing_and_deemphasis(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum phy phy;

	u32 tmp;

	int lane;
@@ -267,7 +267,7 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, 
				     const struct intel_crtc_state *pipe_config)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	u32 dss_ctl1;



	dss_ctl1 = I915_READ(DSS_CTL1);
@@ -306,7 +306,7 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, 
static int afe_clk(struct intel_encoder *encoder,

		   const struct intel_crtc_state *crtc_state)

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	int bpp;



	if (crtc_state->dsc.compression_enable)
@@ -321,7 +321,7 @@ static void gen11_dsi_program_esc_clk_div(struct intel_encoder *encoder, 
					  const struct intel_crtc_state *crtc_state)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum port port;

	int afe_clk_khz;

	u32 esc_clk_div_m;
@@ -360,7 +360,7 @@ static void get_dsi_io_power_domains(struct drm_i915_private *dev_priv, 
static void gen11_dsi_enable_io_power(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum port port;

	u32 tmp;
@@ -376,7 +376,7 @@ static void gen11_dsi_enable_io_power(struct intel_encoder *encoder) 
static void gen11_dsi_power_up_lanes(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum phy phy;



	for_each_dsi_phy(phy, intel_dsi->phys)
@@ -387,7 +387,7 @@ static void gen11_dsi_power_up_lanes(struct intel_encoder *encoder) 
static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum phy phy;

	u32 tmp;

	int lane;
@@ -436,7 +436,7 @@ static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder) 
static void gen11_dsi_voltage_swing_program_seq(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	u32 tmp;

	enum phy phy;
@@ -488,7 +488,7 @@ static void gen11_dsi_voltage_swing_program_seq(struct intel_encoder *encoder) 
static void gen11_dsi_enable_ddi_buffer(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	u32 tmp;

	enum port port;
@@ -509,7 +509,7 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder, 
			     const struct intel_crtc_state *crtc_state)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	u32 tmp;

	enum port port;

	enum phy phy;
@@ -575,7 +575,7 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder, 
static void gen11_dsi_gate_clocks(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	u32 tmp;

	enum phy phy;
@@ -591,7 +591,7 @@ static void gen11_dsi_gate_clocks(struct intel_encoder *encoder) 
static void gen11_dsi_ungate_clocks(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	u32 tmp;

	enum phy phy;
@@ -608,7 +608,7 @@ static void gen11_dsi_map_pll(struct intel_encoder *encoder, 
			      const struct intel_crtc_state *crtc_state)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	struct intel_shared_dpll *pll = crtc_state->shared_dpll;

	enum phy phy;

	u32 val;
@@ -640,7 +640,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, 
			       const struct intel_crtc_state *pipe_config)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->uapi.crtc);

	enum pipe pipe = intel_crtc->pipe;

	u32 tmp;
@@ -789,7 +789,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder, 
				 const struct intel_crtc_state *crtc_state)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	const struct drm_display_mode *adjusted_mode =

		&crtc_state->hw.adjusted_mode;

	enum port port;
@@ -923,7 +923,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder, 
static void gen11_dsi_enable_transcoder(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum port port;

	enum transcoder dsi_trans;

	u32 tmp;
@@ -945,7 +945,7 @@ static void gen11_dsi_setup_timeouts(struct intel_encoder *encoder, 
				     const struct intel_crtc_state *crtc_state)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum port port;

	enum transcoder dsi_trans;

	u32 tmp, hs_tx_timeout, lp_rx_timeout, ta_timeout, divisor, mul;
@@ -1026,7 +1026,7 @@ gen11_dsi_enable_port_and_phy(struct intel_encoder *encoder, 
static void gen11_dsi_powerup_panel(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	struct mipi_dsi_device *dsi;

	enum port port;

	enum transcoder dsi_trans;
@@ -1077,7 +1077,7 @@ static void gen11_dsi_pre_enable(struct intel_encoder *encoder, 
				 const struct intel_crtc_state *pipe_config,

				 const struct drm_connector_state *conn_state)

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);



	/* step3b */

	gen11_dsi_map_pll(encoder, pipe_config);
@@ -1104,7 +1104,7 @@ static void gen11_dsi_pre_enable(struct intel_encoder *encoder, 
static void gen11_dsi_disable_transcoder(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum port port;

	enum transcoder dsi_trans;

	u32 tmp;
@@ -1126,7 +1126,7 @@ static void gen11_dsi_disable_transcoder(struct intel_encoder *encoder) 


static void gen11_dsi_powerdown_panel(struct intel_encoder *encoder)

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);



	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_OFF);

	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_ASSERT_RESET);
@@ -1139,7 +1139,7 @@ static void gen11_dsi_powerdown_panel(struct intel_encoder *encoder) 
static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum port port;

	enum transcoder dsi_trans;

	u32 tmp;
@@ -1180,7 +1180,7 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder) 
static void gen11_dsi_disable_port(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	u32 tmp;

	enum port port;
@@ -1202,7 +1202,7 @@ static void gen11_dsi_disable_port(struct intel_encoder *encoder) 
static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum port port;

	u32 tmp;
@@ -1229,7 +1229,7 @@ static void gen11_dsi_disable(struct intel_encoder *encoder, 
			      const struct intel_crtc_state *old_crtc_state,

			      const struct drm_connector_state *old_conn_state)

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);



	/* step1: turn off backlight */

	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_OFF);
@@ -1272,7 +1272,7 @@ static enum drm_mode_status gen11_dsi_mode_valid(struct drm_connector *connector 
static void gen11_dsi_get_timings(struct intel_encoder *encoder,

				  struct intel_crtc_state *pipe_config)

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	struct drm_display_mode *adjusted_mode =

					&pipe_config->hw.adjusted_mode;
@@ -1313,7 +1313,7 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder, 
{

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

	struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);



	intel_dsc_get_config(encoder, pipe_config);
@@ -1417,7 +1417,8 @@ static void gen11_dsi_get_power_domains(struct intel_encoder *encoder, 
{

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



	get_dsi_io_power_domains(i915, enc_to_intel_dsi(&encoder->base));

	get_dsi_io_power_domains(i915,

				 enc_to_intel_dsi(encoder));



	if (crtc_state->dsc.compression_enable)

		intel_display_power_get(i915,
@@ -1428,7 +1429,7 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder, 
				   enum pipe *pipe)

{

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

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	enum transcoder dsi_trans;

	intel_wakeref_t wakeref;

	enum port port;

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

+32 −31
Original line number Diff line number Diff line
@@ -1238,9 +1238,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->base);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

	struct intel_digital_port *intel_dig_port =

		enc_to_dig_port(&encoder->base);

		enc_to_dig_port(encoder);



	intel_dp->DP = intel_dig_port->saved_port_bits |

		DDI_BUF_CTL_ENABLE | DDI_BUF_TRANS_SELECT(0);
@@ -2224,7 +2224,7 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder, 
	if (WARN_ON(intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)))

		return;



	dig_port = enc_to_dig_port(&encoder->base);

	dig_port = enc_to_dig_port(encoder);

	intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);



	/*
@@ -2294,7 +2294,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->base);

	struct intel_digital_port *intel_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;
@@ -2365,7 +2365,7 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, 
u8 intel_ddi_dp_voltage_max(struct intel_encoder *encoder)

{

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

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

	enum port port = encoder->port;

	enum phy phy = intel_port_to_phy(dev_priv, port);

	int n_entries;
@@ -2504,7 +2504,7 @@ static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder, 
		width = 4;

		rate = 0; /* Rate is always < than 6GHz for HDMI */

	} else {

		struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



		width = intel_dp->lane_count;

		rate = intel_dp->link_rate;
@@ -2630,7 +2630,7 @@ static void icl_combo_phy_ddi_vswing_sequence(struct intel_encoder *encoder, 
		width = 4;

		/* Rate is always < than 6GHz for HDMI */

	} else {

		struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



		width = intel_dp->lane_count;

		rate = intel_dp->link_rate;
@@ -3273,7 +3273,7 @@ static void intel_ddi_enable_fec(struct intel_encoder *encoder, 
	if (!crtc_state->fec_enable)

		return;



	intel_dp = enc_to_intel_dp(&encoder->base);

	intel_dp = enc_to_intel_dp(encoder);

	val = I915_READ(intel_dp->regs.dp_tp_ctl);

	val |= DP_TP_CTL_FEC_ENABLE;

	I915_WRITE(intel_dp->regs.dp_tp_ctl, val);
@@ -3293,7 +3293,7 @@ static void intel_ddi_disable_fec_state(struct intel_encoder *encoder, 
	if (!crtc_state->fec_enable)

		return;



	intel_dp = enc_to_intel_dp(&encoder->base);

	intel_dp = enc_to_intel_dp(encoder);

	val = I915_READ(intel_dp->regs.dp_tp_ctl);

	val &= ~DP_TP_CTL_FEC_ENABLE;

	I915_WRITE(intel_dp->regs.dp_tp_ctl, val);
@@ -3384,10 +3384,10 @@ static void tgl_ddi_pre_enable_dp(struct intel_encoder *encoder, 
				  const struct intel_crtc_state *crtc_state,

				  const struct drm_connector_state *conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

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

	enum phy phy = intel_port_to_phy(dev_priv, encoder->port);

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);

	int level = intel_ddi_dp_level(intel_dp);

	enum transcoder transcoder = crtc_state->cpu_transcoder;
@@ -3525,11 +3525,11 @@ static void hsw_ddi_pre_enable_dp(struct intel_encoder *encoder, 
				  const struct intel_crtc_state *crtc_state,

				  const struct drm_connector_state *conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

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

	enum port port = encoder->port;

	enum phy phy = intel_port_to_phy(dev_priv, port);

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);

	int level = intel_ddi_dp_level(intel_dp);
@@ -3615,12 +3615,12 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder, 
				      const struct intel_crtc_state *crtc_state,

				      const struct drm_connector_state *conn_state)

{

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(&encoder->base);

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);

	struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;

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

	enum port port = encoder->port;

	int level = intel_ddi_hdmi_level(dev_priv, port);

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);



	intel_dp_dual_mode_set_tmds_output(intel_hdmi, true);

	intel_ddi_clk_select(encoder, crtc_state);
@@ -3684,12 +3684,12 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder, 
		intel_ddi_pre_enable_hdmi(encoder, crtc_state, conn_state);

	} else {

		struct intel_lspcon *lspcon =

				enc_to_intel_lspcon(&encoder->base);

				enc_to_intel_lspcon(encoder);



		intel_ddi_pre_enable_dp(encoder, crtc_state, conn_state);

		if (lspcon->active) {

			struct intel_digital_port *dig_port =

					enc_to_dig_port(&encoder->base);

					enc_to_dig_port(encoder);



			dig_port->set_infoframes(encoder,

						 crtc_state->has_infoframe,
@@ -3714,7 +3714,7 @@ static void intel_disable_ddi_buf(struct intel_encoder *encoder, 
	}



	if (intel_crtc_has_dp_encoder(crtc_state)) {

		struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



		val = I915_READ(intel_dp->regs.dp_tp_ctl);

		val &= ~(DP_TP_CTL_ENABLE | DP_TP_CTL_LINK_TRAIN_MASK);
@@ -3734,7 +3734,7 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder, 
				      const struct drm_connector_state *old_conn_state)

{

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

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	struct intel_dp *intel_dp = &dig_port->dp;

	bool is_mst = intel_crtc_has_type(old_crtc_state,

					  INTEL_OUTPUT_DP_MST);
@@ -3787,7 +3787,7 @@ static void intel_ddi_post_disable_hdmi(struct intel_encoder *encoder, 
					const struct drm_connector_state *old_conn_state)

{

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

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	struct intel_hdmi *intel_hdmi = &dig_port->hdmi;



	dig_port->set_infoframes(encoder, false,
@@ -3824,7 +3824,7 @@ static void intel_ddi_post_disable(struct intel_encoder *encoder, 
				   const struct drm_connector_state *old_conn_state)

{

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

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	enum phy phy = intel_port_to_phy(dev_priv, encoder->port);

	bool is_tc_port = intel_phy_is_tc(dev_priv, phy);
@@ -3916,7 +3916,7 @@ static void intel_enable_ddi_dp(struct intel_encoder *encoder, 
				const struct drm_connector_state *conn_state)

{

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

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

	enum port port = encoder->port;



	if (port == PORT_A && INTEL_GEN(dev_priv) < 9)
@@ -3957,7 +3957,7 @@ static void intel_enable_ddi_hdmi(struct intel_encoder *encoder, 
				  const struct drm_connector_state *conn_state)

{

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

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	struct drm_connector *connector = conn_state->connector;

	enum port port = encoder->port;
@@ -4034,7 +4034,7 @@ static void intel_disable_ddi_dp(struct intel_encoder *encoder, 
				 const struct intel_crtc_state *old_crtc_state,

				 const struct drm_connector_state *old_conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



	intel_dp->link_trained = false;
@@ -4082,7 +4082,7 @@ static void intel_ddi_update_pipe_dp(struct intel_encoder *encoder, 
				     const struct intel_crtc_state *crtc_state,

				     const struct drm_connector_state *conn_state)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



	intel_ddi_set_dp_msa(crtc_state, conn_state);
@@ -4146,7 +4146,8 @@ intel_ddi_update_prepare(struct intel_atomic_state *state, 


	WARN_ON(crtc && crtc->active);



	intel_tc_port_get_link(enc_to_dig_port(&encoder->base), required_lanes);

	intel_tc_port_get_link(enc_to_dig_port(encoder),

		               required_lanes);

	if (crtc_state && crtc_state->hw.active)

		intel_update_active_dpll(state, crtc, encoder);

}
@@ -4156,7 +4157,7 @@ intel_ddi_update_complete(struct intel_atomic_state *state, 
			  struct intel_encoder *encoder,

			  struct intel_crtc *crtc)

{

	intel_tc_port_put_link(enc_to_dig_port(&encoder->base));

	intel_tc_port_put_link(enc_to_dig_port(encoder));

}



static void
@@ -4165,7 +4166,7 @@ intel_ddi_pre_pll_enable(struct intel_encoder *encoder, 
			 const struct drm_connector_state *conn_state)

{

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

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	enum phy phy = intel_port_to_phy(dev_priv, encoder->port);

	bool is_tc_port = intel_phy_is_tc(dev_priv, phy);
@@ -4469,7 +4470,7 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder, 


static void intel_ddi_encoder_destroy(struct drm_encoder *encoder)

{

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	struct intel_digital_port *dig_port = enc_to_dig_port(to_intel_encoder(encoder));



	intel_dp_encoder_flush_work(encoder);
@@ -4536,7 +4537,7 @@ static int intel_hdmi_reset_link(struct intel_encoder *encoder, 
				 struct drm_modeset_acquire_ctx *ctx)

{

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

	struct intel_hdmi *hdmi = enc_to_intel_hdmi(&encoder->base);

	struct intel_hdmi *hdmi = enc_to_intel_hdmi(encoder);

	struct intel_connector *connector = hdmi->attached_connector;

	struct i2c_adapter *adapter =

		intel_gmbus_get_adapter(dev_priv, hdmi->ddc_bus);
@@ -4608,7 +4609,7 @@ intel_ddi_hotplug(struct intel_encoder *encoder, 
		  struct intel_connector *connector,

		  bool irq_received)

{

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	struct drm_modeset_acquire_ctx ctx;

	enum intel_hotplug_state state;

	int ret;

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

+2 −2
Original line number Diff line number Diff line
@@ -15029,7 +15029,7 @@ static void intel_set_dp_tp_ctl_normal(struct intel_crtc *crtc, 
		if (conn_state->crtc == &crtc->base)

			break;

	}

	intel_dp = enc_to_intel_dp(&intel_attached_encoder(to_intel_connector(conn))->base);

	intel_dp = enc_to_intel_dp(intel_attached_encoder(to_intel_connector(conn)));

	intel_dp_stop_link_train(intel_dp);

}








@@ -18330,7 +18330,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev,







		/* We need to sanitize only the MST primary port. */









		if (encoder->type != INTEL_OUTPUT_DP_MST &&









		    intel_phy_is_tc(dev_priv, phy))









			intel_tc_port_sanitize(enc_to_dig_port(&encoder->base));









			intel_tc_port_sanitize(enc_to_dig_port(encoder));









	}

















	get_encoder_power_domains(dev_priv);

























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



+3
−3






























Original line number
Diff line number
Diff line







@@ -514,7 +514,7 @@ static void icl_tc_port_assert_ref_held(struct drm_i915_private *dev_priv,







		if (encoder->type == INTEL_OUTPUT_DP_MST)









			continue;



















		dig_port = enc_to_dig_port(&encoder->base);









		dig_port = enc_to_dig_port(encoder);









		if (WARN_ON(!dig_port))









			continue;


















@@ -1664,8 +1664,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->base));









	enum dpio_channel ch = vlv_dport_to_channel(enc_to_dig_port(&encoder->base));









	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));



















	mutex_lock(&power_domains->lock);










































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



+10
−9






























Original line number
Diff line number
Diff line







@@ -1457,12 +1457,12 @@ static inline bool intel_encoder_is_dig_port(struct intel_encoder *encoder)







}



















static inline struct intel_digital_port *









enc_to_dig_port(struct drm_encoder *encoder)









enc_to_dig_port(struct intel_encoder *encoder)









{









	struct intel_encoder *intel_encoder = to_intel_encoder(encoder);









	struct intel_encoder *intel_encoder = encoder;



















	if (intel_encoder_is_dig_port(intel_encoder))









		return container_of(encoder, struct intel_digital_port,









		return container_of(&encoder->base, struct intel_digital_port,









				    base.base);









	else









		return NULL;








@@ -1471,16 +1471,17 @@ enc_to_dig_port(struct drm_encoder *encoder)







static inline struct intel_digital_port *









conn_to_dig_port(struct intel_connector *connector)









{









	return enc_to_dig_port(&intel_attached_encoder(connector)->base);









	return enc_to_dig_port(intel_attached_encoder(connector));









}



















static inline struct intel_dp_mst_encoder *









enc_to_mst(struct drm_encoder *encoder)









enc_to_mst(struct intel_encoder *encoder)









{









	return container_of(encoder, struct intel_dp_mst_encoder, base.base);









	return container_of(&encoder->base, struct intel_dp_mst_encoder,









			    base.base);









}



















static inline struct intel_dp *enc_to_intel_dp(struct drm_encoder *encoder)









static inline struct intel_dp *enc_to_intel_dp(struct intel_encoder *encoder)









{









	return &enc_to_dig_port(encoder)->dp;









}








@@ -1493,14 +1494,14 @@ static inline bool intel_encoder_is_dp(struct intel_encoder *encoder)







		return true;









	case INTEL_OUTPUT_DDI:









		/* Skip pure HDMI/DVI DDI encoders */









		return i915_mmio_reg_valid(enc_to_intel_dp(&encoder->base)->output_reg);









		return i915_mmio_reg_valid(enc_to_intel_dp(encoder)->output_reg);









	default:









		return false;









	}









}



















static inline struct intel_lspcon *









enc_to_intel_lspcon(struct drm_encoder *encoder)









enc_to_intel_lspcon(struct intel_encoder *encoder)









{









	return &enc_to_dig_port(encoder)->lspcon;









}








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE