Merge remote-tracking branch 'rcu/rcu/next'

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_dp_mst.c

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index fa0dabf578dc51c7b2371ecc9a1f1342b345892f..2a2ab306ad8457f523c06ffdfc543e847d2ebe4a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -184,7 +184,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
        intel_mst->port = found->port;
 
        if (intel_dp->active_mst_links == 0) {
-               intel_ddi_clk_select(encoder, intel_crtc->config);
+               intel_prepare_ddi_buffer(&intel_dig_port->base);
+
+               intel_ddi_clk_select(&intel_dig_port->base, intel_crtc->config);
 
                intel_dp_set_link_params(intel_dp, intel_crtc->config);