[RESEND,FOR,CI,1/2] drm/i915/dp/mst: Fix MST logic in intel_dp_long_pulse()

Commit Message

Ander Conselvan de Oliveira April 13, 2016, 7:47 a.m. UTC

From: "[e-mail]" <[e-mail]>

In commit 7d23e3c37bb3 ("drm/i915: Cleaning up intel_dp_hpd_pulse") some
much needed clean-up was done, but unfortunately part of the change
broke DP MST.  The real issue was setting the connector state to
disconnected in the MST case, which is good, but the code then (after
a goto) checks if the connector state is not connected and shuts down
MST if this is the case, which is bad.  With this change both SST and
MST seem to be happy.

v2: Add removed check further up in the function to be sure that MST
    is shut down when we lose the link. (Ander)

Fixes: commit 7d23e3c37bb3 ("drm/i915: Cleaning up intel_dp_hpd_pulse")
cc: Sivakumar Thulasimani <[e-mail]>
cc: Shubhangi Shrivastava <[e-mail]>
cc: Ander Conselvan de Oliveira <[e-mail]>
cc: Nathan D Ciobanu <[e-mail]>
Signed-off-by: Jim Bride <[e-mail]>
Reviewed-by: Ander Conselvan de Oliveira <[e-mail]>
Reviewed-by: Lyude <[e-mail]>
Signed-off-by: Ander Conselvan de Oliveira <[e-mail]>
Link: http://patchwork.freedesktop.org/patch/msgid/[e-mail]
---
 drivers/gpu/drm/i915/intel_dp.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

Comments

Ander Conselvan de Oliveira April 19, 2016, 4:28 p.m. UTC | #1

Finland CI approved the patch in a resend to trybot, and the Romania failures
are know issues, so I pushed those two patches to dinq.

https://patchwork.freedesktop.org/series/5864/

Ander

On Wed, 2016-04-13 at 16:53 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [RESEND,FOR,CI,1/2] drm/i915/dp/mst: Fix MST
> logic in intel_dp_long_pulse()
> URL   : https://patchwork.freedesktop.org/series/5642/
> State : failure
> 
> == Summary ==
> 
> Series 5642v1 Series without cover letter
> http://patchwork.freedesktop.org/api/1.0/series/5642/revisions/1/mbox/
> 
> Test gem_busy:
>         Subgroup basic-blt:
>                 pass       -> SKIP       (bsw-nuc-2)
> Test gem_exec_suspend:
>         Subgroup basic-s3:
>                 incomplete -> PASS       (hsw-gt2)
> 
> bdw-nuci7        total:203  pass:191  dwarn:0   dfail:0   fail:0   skip:12 
> bdw-ultra        total:203  pass:180  dwarn:0   dfail:0   fail:0   skip:23 
> bsw-nuc-2        total:202  pass:162  dwarn:0   dfail:0   fail:0   skip:40 
> byt-nuc          total:202  pass:164  dwarn:0   dfail:0   fail:0   skip:38 
> hsw-brixbox      total:203  pass:179  dwarn:0   dfail:0   fail:0   skip:24 
> hsw-gt2          total:203  pass:184  dwarn:0   dfail:0   fail:0   skip:19 
> ilk-hp8440p      total:203  pass:135  dwarn:0   dfail:0   fail:0   skip:68 
> ivb-t430s        total:203  pass:175  dwarn:0   dfail:0   fail:0   skip:28 
> skl-i7k-2        total:203  pass:178  dwarn:0   dfail:0   fail:0   skip:25 
> skl-nuci5        total:203  pass:192  dwarn:0   dfail:0   fail:0   skip:11 
> snb-x220t        total:203  pass:165  dwarn:0   dfail:0   fail:1   skip:37 
> BOOT FAILED for snb-dellxps
> 
> Results at /archive/results/CI_IGT_test/Patchwork_1883/
> 
> 631ffd2f45bb43964f729e8661532fb115f5eeec drm-intel-nightly: 2016y-04m-13d-13h
> -00m-18s UTC integration manifest
> abc7779 drm/i915: Fixing eDP detection on certain platforms
> 21f527d drm/i915/dp/mst: Fix MST logic in intel_dp_long_pulse()
> 
> _______________________________________________
> Intel-gfx mailing list
> [e-mail]
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 7523558..6c6f95a2 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4578,6 +4578,15 @@  intel_dp_long_pulse(struct intel_connector *intel_connector)
 		intel_dp->compliance_test_type = 0;
 		intel_dp->compliance_test_data = 0;
 
+		if (intel_dp->is_mst) {
+			DRM_DEBUG_KMS("MST device may have disappeared %d vs %d\n",
+				      intel_dp->is_mst,
+				      intel_dp->mst_mgr.mst_state);
+			intel_dp->is_mst = false;
+			drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr,
+							intel_dp->is_mst);
+		}
+
 		goto out;
 	}
 
@@ -4635,20 +4644,9 @@  intel_dp_long_pulse(struct intel_connector *intel_connector)
 	}
 
 out:
-	if (status != connector_status_connected) {
+	if ((status != connector_status_connected) &&
+	    (intel_dp->is_mst == false))
 		intel_dp_unset_edid(intel_dp);
-		/*
-		 * If we were in MST mode, and device is not there,
-		 * get out of MST mode
-		 */
-		if (intel_dp->is_mst) {
-			DRM_DEBUG_KMS("MST device may have disappeared %d vs %d\n",
-				      intel_dp->is_mst, intel_dp->mst_mgr.mst_state);
-			intel_dp->is_mst = false;
-			drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr,
-							intel_dp->is_mst);
-		}
-	}
 
 	intel_display_power_put(to_i915(dev), power_domain);
 	return;