[patch] backported i915 patch from Linus' tree

2700_i915-to-SET-POWER-dpcd-to-enable-MST-hub.patch (text/plain), 1.30 KB, created by Mike Pagano on 2018-03-29 23:49:10 UTC

--- a/drivers/gpu/drm/i915/intel_ddi.c	2018-03-29 19:32:40.262985350 -0400
+++ b/drivers/gpu/drm/i915/intel_ddi.c	2018-03-29 19:36:15.373690799 -0400
@@ -2208,8 +2208,7 @@ static void intel_ddi_pre_enable_dp(stru
 		intel_prepare_dp_ddi_buffers(encoder);
 
 	intel_ddi_init_dp_buf_reg(encoder);
-	if (!is_mst)
-		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
+	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
 	intel_dp_start_link_train(intel_dp);
 	if (port != PORT_A || INTEL_GEN(dev_priv) >= 9)
 		intel_dp_stop_link_train(intel_dp);
@@ -2294,20 +2293,13 @@ static void intel_ddi_post_disable_dp(st
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
 	struct intel_dp *intel_dp = &dig_port->dp;
-	/*
-	 * old_crtc_state and old_conn_state are NULL when called from
-	 * DP_MST. The main connector associated with this port is never
-	 * bound to a crtc for MST.
-	 */
-	bool is_mst = !old_crtc_state;
 
 	/*
 	 * Power down sink before disabling the port, otherwise we end
 	 * up getting interrupts from the sink on detecting link loss.
 	 */
-	if (!is_mst)
-		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
 
+	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
 	intel_disable_ddi_buf(encoder);
 
 	intel_edp_panel_vdd_on(intel_dp);