drm/i915/dp/mst: Fix MST logic in intel_dp_long_pulse()
Subsystems (2)
PATCH RESEND 1/2 drm/i915/dp/mst: Fix MST logic in intel_dp_long_pulse()
From: "[email protected]" <[email protected]>
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)
--- drivers/gpu/drm/i915/intel_dp.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +11 -13
@@ -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 ;
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND 2/2 drm/i915: Fixing eDP detection on certain platforms
From: Shubhangi Shrivastava <[email protected]>
Since commit 30d9aa4265fe ("drm/i915: Read sink_count dpcd always"), the status of a DP connector depends on its sink count value. However, some eDP panels don't set that value appropriately, causing them to be reported as disconnected.
Fix this by ignoring sink count for eDP.
v2: Rephrased commit message. (Ander)
In case of eDP, returning status as connected if DPCD read succeeds to avoid any further operations.
--- drivers/gpu/drm/i915/intel_dp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +4 -1
@@ -3776,7 +3776,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)* downstream port information. So, an early return here saves * time from performing other operations which are not required. */ -if (!intel_dp->sink_count) +if (!is_edp (intel_dp) && !intel_dp->sink_count)return false;/* Check if the panel supports PSR */
@@ -4309,6 +4309,9 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp)if (!intel_dp_get_dpcd (intel_dp))return connector_status_disconnected; +if (is_edp (intel_dp)) +return connector_status_connected; +/* if there's no downstream port, we're done */ if (!(dpcd[DP_DOWNSTREAMPORT_PRESENT ] &DP_DWN_STRM_PORT_PRESENT ))return connector_status_connected;
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RESEND FOR CI PATCH 2/2] drm/i915: Fixing eDP detection on certain platforms
Ping. Any chance we could get these pushed upstream soon?
Quoted 48 lines · Ander Conselvan de Oliveira
From: Shubhangi Shrivastava <[email protected]>
Since commit
30d9aa4265fe("drm/i915: Readsink_countdpcd always"), the status of a DP connector depends on its sink count value. However, some eDP panels don't set that value appropriately, causing them to be reported as disconnected.
Fix this by ignoring sink count for eDP.v2: Rephrased commit message. (Ander)
In case of eDP, returning status as connected if DPCD read succeeds to avoid any further operations.Fixes 30d9aa4265fe ("drm/i915: Read sink_count dpcd always")Cc Ander Conselvan De Oliveira <[email protected]>Cc Jani Nikula <[email protected]>Reported-by Tvrtko Ursulin <[email protected]>Signed-off-by Sivakumar Thulasimani <[email protected]>Signed-off-by Shubhangi Shrivastava <[email protected]>Tested-by Tvrtko Ursulin <[email protected]>Reviewed-by Ander Conselvan de Oliveira <[email protected]>com>
[email protected]
---
drivers/gpu/drm/i915/intel_dp.c | 5 ++++-1 file changed, 4 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -3776,7 +3776,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)* downstream port information. So, an early return here saves * time from performing other operations which are not required. */ -if (!intel_dp->sink_count) +if (!is_edp (intel_dp) && !intel_dp->sink_count) return false;
/* Check if the panel supports PSR */drivers/gpu/drm/i915/intel_dp.c +0
-0@@ -4309,6 +4309,9 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) if (!intel_dp_get_dpcd(intel_dp)) return connector_status_disconnected;drivers/gpu/drm/i915/intel_dp.c +3
-0+if (is_edp (intel_dp)) +return connector_status_connected; +
Quoted 3 lines
/* if there's no downstream port, we're done */
if (!(dpcd[DP_DOWNSTREAMPORT_PRESENT] &DP_DWN_STRM_PORT_PRESENT)) returnconnector_status_connected;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RESEND FOR CI PATCH 2/2] drm/i915: Fixing eDP detection on certain platforms
Quoted 1 line · Lyude
Ping. Any chance we could get these pushed upstream soon?
They were pushed to dinq Tuesday.
Ander
Quoted 50 lines · Ander Conselvan de Oliveira
Quoted 48 lines
From: Shubhangi Shrivastava <[email protected]>
Since commit
30d9aa4265fe("drm/i915: Readsink_countdpcd always"), the status of a DP connector depends on its sink count value. However, some eDP panels don't set that value appropriately, causing them to be reported as disconnected.
Fix this by ignoring sink count for eDP.v2: Rephrased commit message. (Ander)
In case of eDP, returning status as connected if DPCD read succeeds to avoid any further operations.Fixes 30d9aa4265fe ("drm/i915: Read sink_count dpcd always")Cc Ander Conselvan De Oliveira <[email protected]>Cc Jani Nikula <[email protected]>Reported-by Tvrtko Ursulin <[email protected]>Signed-off-by Sivakumar Thulasimani <[email protected]>Signed-off-by Shubhangi Shrivastava <[email protected]>Tested-by Tvrtko Ursulin <[email protected]>Reviewed-by Ander Conselvan de Oliveira <[email protected]>Signed-off-by Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.
com>
Link:
http://patchwork.freedesktop.org/patch/msgid/1460444034-22320-1-git-send(quoted diff) +0
-2[email protected] --- drivers/gpu/drm/i915/intel_dp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -3776,7 +3776,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)* downstream port information. So, an early return here saves * time from performing other operations which are not required. */ -if (!intel_dp->sink_count) +if (!is_edp (intel_dp) && !intel_dp->sink_count)return false;/* Check if the panel supports PSR */ @@ -4309,6 +4309,9 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp)if (!intel_dp_get_dpcd (intel_dp))return connector_status_disconnected;
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c intel_dp_detect_dpcd(struct intel_dp *intel_dp) · line 4317
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0+if (is_edp (intel_dp)) +return connector_status_connected; +/* if there's no downstream port, we're done */ if (!(dpcd[DP_DOWNSTREAMPORT_PRESENT ] &DP_DWN_STRM_PORT_PRESENT ))return connector_status_connected;_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [RESEND,FOR,CI,1/2] drm/i915/dp/mst: Fix MST logic in intel_dp_long_pulse()
In reply to Ander Conselvan de Oliveira== Series Details ==
== 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for series starting with [RESEND,FOR,CI,1/2] drm/i915/dp/mst: Fix MST logic in intel_dp_long_pulse()
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
Quoted 39 lines · Patchwork
== 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:37BOOT FAILED for snb-dellxps
Results at /archive/results/CI_IGT_test/Patchwork_1883/
631ffd2f45bb43964f729e8661532fb115f5eeecdrm-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 inintel_dp_long_pulse()
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx