drm/i915: Setup DDI clk for MST on SKL

Set up the DDI->PLL mapping on SKL also for MST links. Might help make
MST operational on SKL.

v2: Rebased due to KBL
    Improve the patch subject, Jesse provided the new one

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1439826380-18403-1-git-send-email-ville.syrjala@linux.intel.com
References: https://bugs.freedesktop.org/show_bug.cgi?id=91791
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 1 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 15372598b2c3..8a604ac797aa 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -173,20 +173,14 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
         intel_mst->port = found->port;
 
         if (intel_dp->active_mst_links == 0) {
-                enum port port = intel_ddi_get_encoder_port(encoder);
+                intel_ddi_clk_select(encoder, intel_crtc->config);
 
                 intel_dp_set_link_params(intel_dp, intel_crtc->config);
 
-                /* FIXME: add support for SKL */
-                if (INTEL_INFO(dev)->gen < 9)
-                        I915_WRITE(PORT_CLK_SEL(port),
-                                   intel_crtc->config->ddi_pll_sel);
-
                 intel_ddi_init_dp_buf_reg(&intel_dig_port->base);
 
                 intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
 
-
                 intel_dp_start_link_train(intel_dp);
                 intel_dp_stop_link_train(intel_dp);
         }