[Intel-gfx] [PATCH 12/23] drm/i915: split fdi link training from display vtable.

[Dave Airlie]

From: Dave Airlie <airl...@redhat.com>

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: Jani Nikula <jani.nik...@intel.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
 drivers/gpu/drm/i915/display/intel_fdi.c |  8 ++++----
 drivers/gpu/drm/i915/i915_drv.h          | 11 ++++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c 
b/drivers/gpu/drm/i915/display/intel_fdi.c
index 339243399a65..94bb7e039fe7 100644
--- a/drivers/gpu/drm/i915/display/intel_fdi.c
+++ b/drivers/gpu/drm/i915/display/intel_fdi.c
@@ -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;
        }
 }
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index caf854d251a6..680301bce3ab 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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;
 
-- 
2.31.1