Attachment 138089 Details for Bug 105470 – Revert

[patch] Revert

0001-Revert-drm-i915-mst-Use-MST-sideband-message-transac.patch (text/plain), 2.54 KB, created by Dhinakaran Pandiyan on 2018-03-14 06:04:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dhinakaran Pandiyan

Created: 2018-03-14 06:04:18 UTC

Size: 2.54 KB

patch

obsolete

>From cc2e5084adc9c147d2082201dbd962eb687ffe5c Mon Sep 17 00:00:00 2001
>From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>Date: Tue, 13 Mar 2018 22:59:47 -0700
>Subject: [PATCH] Revert "drm/i915/mst: Use MST sideband message transactions
> for dpms control"
>
>This reverts commit 5ea2355a100a3c6304901d058aee06d3a6be69bc.
>
>Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>---
> drivers/gpu/drm/i915/intel_ddi.c    | 6 ++----
> drivers/gpu/drm/i915/intel_dp_mst.c | 8 --------
> 2 files changed, 2 insertions(+), 12 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
>index dbcf1a0586f9..d812db88fc3a 100644
>--- a/drivers/gpu/drm/i915/intel_ddi.c
>+++ b/drivers/gpu/drm/i915/intel_ddi.c
>@@ -2205,8 +2205,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
> 		intel_prepare_dp_ddi_buffers(encoder, crtc_state);
> 
> 	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);
>@@ -2310,8 +2309,7 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,
> 	 * 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);
> 
>diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
>index c3de0918ee13..2501c94e0ae2 100644
>--- a/drivers/gpu/drm/i915/intel_dp_mst.c
>+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
>@@ -170,13 +170,6 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,
> 
> 	drm_dp_mst_deallocate_vcpi(&intel_dp->mst_mgr, connector->port);
> 
>-	/*
>-	 * Power down mst path before disabling the port, otherwise we end
>-	 * up getting interrupts from the sink upon detecting link loss.
>-	 */
>-	drm_dp_send_power_updown_phy(&intel_dp->mst_mgr, connector->port,
>-				     false);
>-
> 	intel_dp->active_mst_links--;
> 
> 	intel_mst->connector = NULL;
>@@ -223,7 +216,6 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,
> 
> 	DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);
> 
>-	drm_dp_send_power_updown_phy(&intel_dp->mst_mgr, connector->port, true);
> 	if (intel_dp->active_mst_links == 0)
> 		intel_dig_port->base.pre_enable(&intel_dig_port->base,
> 						pipe_config, NULL);
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 105470: 138048 | 138078 | 138088 | 138089

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.