aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dp_mst.c
diff options
context:
space:
mode:
authorVille Syrjälä <[email protected]>2015-12-08 17:59:44 +0000
committerVille Syrjälä <[email protected]>2016-01-12 14:05:12 +0000
commit6a7e4f99897f31708ff9ea01875d9ff112bebe90 (patch)
treee27467972dcdad281b25883b4b23c9f8053729de /drivers/gpu/drm/i915/intel_dp_mst.c
parentdrm/i915: Reject >9 ddi translation entried if port != A/E on SKL (diff)
downloadkernel-6a7e4f99897f31708ff9ea01875d9ff112bebe90.tar.gz
kernel-6a7e4f99897f31708ff9ea01875d9ff112bebe90.zip
drm/i915: Kill intel_prepare_ddi()
Move the ddi buffer translation programming to occur from the encoder .pre_enable() hook, for just the ddi port we are enabling. Previously we used to reprogram the translations for all ddi ports during init and during power well enabling. v2: s/intel_prepare_ddi_buffers/intel_prepare_ddi_buffer/ (Daniel) Resolve conflicts due to dev_priv->atomic_cdclk_freq Signed-off-by: Ville Syrjälä <[email protected]> Reviewed-by: Daniel Vetter <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
-rw-r--r--drivers/gpu/drm/i915/intel_dp_mst.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 5cb168dc2f0c..6f4762dc5a94 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -184,6 +184,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
intel_mst->port = found->port;
if (intel_dp->active_mst_links == 0) {
+ 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);