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

drm/i915: Extract intel_ddi_power_up_lanes() 



Reduce the copypasta by pulling the combo PHY lane
power up stuff into a helper. We'll have a third user soon.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210128155948.13678-2-ville.syrjala@linux.intel.com


Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
parent f8c6b615

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

+19 −16
Original line number Diff line number Diff line
@@ -3621,6 +3621,23 @@ static void intel_ddi_disable_fec_state(struct intel_encoder *encoder, 
	intel_de_posting_read(dev_priv, dp_tp_ctl_reg(encoder, crtc_state));

}



static void intel_ddi_power_up_lanes(struct intel_encoder *encoder,

				     const struct intel_crtc_state *crtc_state)

{

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

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

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



	if (intel_phy_is_combo(i915, phy)) {

		bool lane_reversal =

			dig_port->saved_port_bits & DDI_BUF_PORT_REVERSAL;



		intel_combo_phy_power_up_lanes(i915, phy, false,

					       crtc_state->lane_count,

					       lane_reversal);

	}

}



static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state,

				  struct intel_encoder *encoder,

				  const struct intel_crtc_state *crtc_state,
@@ -3712,14 +3729,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, 
	 * 7.f Combo PHY: Configure PORT_CL_DW10 Static Power Down to power up

	 * the used lanes of the DDI.

	 */

	if (intel_phy_is_combo(dev_priv, phy)) {

		bool lane_reversal =

			dig_port->saved_port_bits & DDI_BUF_PORT_REVERSAL;



		intel_combo_phy_power_up_lanes(dev_priv, phy, false,

					       crtc_state->lane_count,

					       lane_reversal);

	}

	intel_ddi_power_up_lanes(encoder, crtc_state);



	/*

	 * 7.g Configure and enable DDI_BUF_CTL
@@ -3810,14 +3820,7 @@ static void hsw_ddi_pre_enable_dp(struct intel_atomic_state *state, 
	else

		intel_prepare_dp_ddi_buffers(encoder, crtc_state);



	if (intel_phy_is_combo(dev_priv, phy)) {

		bool lane_reversal =

			dig_port->saved_port_bits & DDI_BUF_PORT_REVERSAL;



		intel_combo_phy_power_up_lanes(dev_priv, phy, false,

					       crtc_state->lane_count,

					       lane_reversal);

	}

	intel_ddi_power_up_lanes(encoder, crtc_state);



	intel_ddi_init_dp_buf_reg(encoder, crtc_state);

	if (!is_mst)