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

drm/i915: Call hsw_fdi_link_train() directly() 



Remove the pointless vfunc detour for hsw_fdi_link_train()
and just call it directly. Also pass the encoder in so we
can nuke the silly encoder loop within.

Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191213195217.15168-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent 74cb2751

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

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static void hsw_pre_enable_crt(struct intel_encoder *encoder, 


	intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false);



	dev_priv->display.fdi_link_train(crtc, crtc_state);

	hsw_fdi_link_train(encoder, crtc_state);



	intel_ddi_enable_pipe_clock(crtc_state);

}

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

+4 −8
Original line number Diff line number Diff line
@@ -1107,18 +1107,14 @@ static u32 icl_pll_to_ddi_clk_sel(struct intel_encoder *encoder, 
 * DDI A (which is used for eDP)

 */



void hsw_fdi_link_train(struct intel_crtc *crtc,

void hsw_fdi_link_train(struct intel_encoder *encoder,

			const struct intel_crtc_state *crtc_state)

{

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_encoder *encoder;

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

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

	u32 temp, i, rx_ctl_val, ddi_pll_sel;



	for_each_encoder_on_crtc(dev, &crtc->base, encoder) {

		WARN_ON(encoder->type != INTEL_OUTPUT_ANALOG);

	intel_prepare_dp_ddi_buffers(encoder, crtc_state);

	}



	/* Set the FDI_RX_MISC pwrdn lanes and the 2 workarounds listed at the

	 * mode set "sequence for CRT port" document:

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct intel_encoder; 
void intel_ddi_fdi_post_disable(struct intel_encoder *intel_encoder,

				const struct intel_crtc_state *old_crtc_state,

				const struct drm_connector_state *old_conn_state);

void hsw_fdi_link_train(struct intel_crtc *crtc,

void hsw_fdi_link_train(struct intel_encoder *encoder,

			const struct intel_crtc_state *crtc_state);

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

bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe);

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

+0 −2
Original line number Diff line number Diff line
@@ -16672,8 +16672,6 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) 
	} else if (IS_IVYBRIDGE(dev_priv)) {

		/* FIXME: detect B0+ stepping and use auto training */

		dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train;

	} else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) {

		dev_priv->display.fdi_link_train = hsw_fdi_link_train;

	}



	if (INTEL_GEN(dev_priv) >= 9)

CRA Git | Maintained and supported by SUSTech CRA and CCSE