Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-misc-next

Resync with drm-next, I have a patch which currently can't be applied
because drm-misc-next lacked the latest drm/i915 code.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 12 insertions, 25 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index f51574f7f160..c1f62eb07c07 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -47,6 +47,11 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
 
         pipe_config->has_pch_encoder = false;
         bpp = 24;
+        if (intel_dp->compliance.test_data.bpc) {
+                bpp = intel_dp->compliance.test_data.bpc * 3;
+                DRM_DEBUG_KMS("Setting pipe bpp to %d\n",
+                              bpp);
+        }
         /*
          * for MST we always configure max link bw - the spec doesn't
          * seem to suggest we should do otherwise.
@@ -55,7 +60,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
 
         pipe_config->lane_count = lane_count;
 
-        pipe_config->pipe_bpp = 24;
+        pipe_config->pipe_bpp = bpp;
         pipe_config->port_clock = intel_dp_max_link_rate(intel_dp);
 
         state = pipe_config->base.state;
@@ -87,7 +92,6 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,
         struct intel_dp *intel_dp = &intel_dig_port->dp;
         struct intel_connector *connector =
                 to_intel_connector(old_conn_state->connector);
-        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         int ret;
 
         DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);
@@ -98,10 +102,8 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,
         if (ret) {
                 DRM_ERROR("failed to update payload %d\n", ret);
         }
-        if (old_crtc_state->has_audio) {
+        if (old_crtc_state->has_audio)
                 intel_audio_codec_disable(encoder);
-                intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
-        }
 }
 
 static void intel_mst_post_disable_dp(struct intel_encoder *encoder,
@@ -156,23 +158,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,
 
         DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);
 
-        if (intel_dp->active_mst_links == 0) {
-                intel_ddi_clk_select(&intel_dig_port->base,
-                                     pipe_config->shared_dpll);
-
-                intel_prepare_dp_ddi_buffers(&intel_dig_port->base);
-                intel_dp_set_link_params(intel_dp,
-                                         pipe_config->port_clock,
-                                         pipe_config->lane_count,
-                                         true);
-
-                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);
-        }
+        if (intel_dp->active_mst_links == 0)
+                intel_dig_port->base.pre_enable(&intel_dig_port->base,
+                                                pipe_config, NULL);
 
         ret = drm_dp_mst_allocate_vcpi(&intel_dp->mst_mgr,
                                        connector->port,
@@ -214,10 +202,8 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,
         ret = drm_dp_check_act_status(&intel_dp->mst_mgr);
 
         ret = drm_dp_update_payload_part2(&intel_dp->mst_mgr);
-        if (pipe_config->has_audio) {
-                intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
+        if (pipe_config->has_audio)
                 intel_audio_codec_enable(encoder, pipe_config, conn_state);
-        }
 }
 
 static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
@@ -548,6 +534,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
                          DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe));
 
         intel_encoder->type = INTEL_OUTPUT_DP_MST;
+        intel_encoder->power_domain = intel_dig_port->base.power_domain;
         intel_encoder->port = intel_dig_port->port;
         intel_encoder->crtc_mask = 0x7;
         intel_encoder->cloneable = 0;