Commit 5c8c179b authored by Dave Airlie's avatar Dave Airlie Committed by Jani Nikula
Browse files

drm/i915: split fdi link training from display vtable. 



It may make sense to merge this with display again later,
however the fdi use of the vtable is limited to only a
few generations.

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7af7359b6cec33bd2d32152893d9a1e8f8cf7f21.1632869550.git.jani.nikula@intel.com
parent de1677c5

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

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ void intel_fdi_link_train(struct intel_crtc *crtc, 
{

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



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

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

}



/* units of 100MHz */
@@ -1017,11 +1017,11 @@ void 
intel_fdi_init_hook(struct drm_i915_private *dev_priv)

{

	if (IS_IRONLAKE(dev_priv)) {

		dev_priv->display.fdi_link_train = ilk_fdi_link_train;

		dev_priv->fdi_funcs.fdi_link_train = ilk_fdi_link_train;

	} else if (IS_SANDYBRIDGE(dev_priv)) {

		dev_priv->display.fdi_link_train = gen6_fdi_link_train;

		dev_priv->fdi_funcs.fdi_link_train = gen6_fdi_link_train;

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

		dev_priv->fdi_funcs.fdi_link_train = ivb_manual_fdi_link_train;

	}

}

drivers/gpu/drm/i915/i915_drv.h

+8 −3
Original line number Diff line number Diff line
@@ -388,6 +388,11 @@ struct intel_hotplug_funcs { 
	void (*hpd_irq_setup)(struct drm_i915_private *dev_priv);

};



struct intel_fdi_funcs {

	void (*fdi_link_train)(struct intel_crtc *crtc,

			       const struct intel_crtc_state *crtc_state);

};



struct drm_i915_display_funcs {

	/* Returns the active state of the crtc, and if the crtc is active,

	 * fills out the pipe-config with the hw state. */
@@ -403,9 +408,6 @@ struct drm_i915_display_funcs { 
	void (*commit_modeset_enables)(struct intel_atomic_state *state);

	void (*commit_modeset_disables)(struct intel_atomic_state *state);



	void (*fdi_link_train)(struct intel_crtc *crtc,

			       const struct intel_crtc_state *crtc_state);



	/* clock updates for mode set */

	/* cursor updates */

	/* render clock increase/decrease */
@@ -985,6 +987,9 @@ struct drm_i915_private { 
	/* irq display functions */

	struct intel_hotplug_funcs hotplug_funcs;



	/* fdi display functions */

	struct intel_fdi_funcs fdi_funcs;



	/* Display functions */

	struct drm_i915_display_funcs display;