drm/i915/dp: Limit link training clock recovery loop
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/2 drm/i915/dp: Limit link training clock recovery loop
From: Nathan Ciobanu <[email protected]>
Limit the link training clock recovery loop to 10 attempts at LANEx_CR_DONE per DP 1.4 spec section 3.5.1.2.2 and 80 attempts for pre-DP 1.4 (4 voltage levels x 4 preemphasis levels x
x 5 identical voltages tries). Some faulty USB-C MST hubs can cause us to get stuck in this loop indefinitely requesting something like:
voltage swing: 0, pre-emphasis level: 2
voltage swing: 1, pre-emphasis level: 2
voltage swing: 0, pre-emphasis level: 3
over and over so max_vswing would never be reached, drm_dp_clock_recovery_ok() would never return true and voltage_tries would always get reset to 1. The driver sends those values to the hub but the hub keeps requesting new values every time.
Changes in v2:
- updated commit message (DK, Manasi)
- defined DP_DP14_MAX_CR_TRIES (Marc)
- made the loop iterate for max 10 times (Rodrigo, Marc)
Changes in v3:
- changed error message to use DP_DP14_MAX_CR_TRIES
Changes in v4:
- Updated the title to reflect the change
- Updated the commit message
- Added 80 attempts for pre-DP 1.4 devices
Changes in v5:
- Removed DP_DP14_MAX_CR_TRIES from drm
v6: Updated comment to match kernel style (Rodrigo)
--- drivers/gpu/drm/i915/intel_dp_link_training.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp_link_training.c +15 -2
@@ -129,7 +129,7 @@ static bool intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp) {uint8_t voltage; -int voltage_tries, max_vswing_tries; +int voltage_tries, max_vswing_tries, cr_tries, max_cr_tries;uint8_t link_config[2 ];uint8_t link_bw, rate_select;
@@ -170,9 +170,20 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)return false; } +/* +* DP 1.4 spec clock recovery retries defined but +* for devices pre-DP 1.4 we set the retry limit +* to 4 (voltage levels) x 4 (preemphasis levels) x +* x 5 (same voltage retries) = 80 (max iterations) +*/ +if (intel_dp->dpcd[DP_DPCD_REV ] >=DP_DPCD_REV_14 ) + max_cr_tries =10 ; +else + max_cr_tries =80 ; + voltage_tries =1 ; max_vswing_tries =0 ; -for (;;) { +for (cr_tries =0 ; cr_tries < max_cr_tries; ++cr_tries) {uint8_t link_status[DP_LINK_STATUS_SIZE ];drm_dp_link_train_clock_recovery_delay (intel_dp->dpcd);
@@ -216,6 +227,8 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp) ++max_vswing_tries; } +DRM_ERROR ("Failed clock recovery %d times, giving up!\n" , max_cr_tries); +return false; }/*
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 2/2 drm/i915/dp: Refactor max_vswing_tries variable
From: Nathan Ciobanu <[email protected]>
Changes the type and renames the max_vswing_tries variable which was declared as an integer but used as a boolean making it easy to be confused with a counter.
Changes in v2:
- updated the title and commit message
- left the loop exit point in place
v3: fix typo in title
v4: renamed max_vswing to max_vswing_reached (Ville)
--- drivers/gpu/drm/i915/intel_dp_link_training.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_dp_link_training.c +4 -4
@@ -129,7 +129,8 @@ static bool intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp) {uint8_t voltage; -int voltage_tries, max_vswing_tries, cr_tries, max_cr_tries; +int voltage_tries, cr_tries, max_cr_tries; +bool max_vswing_reached = false;uint8_t link_config[2 ];uint8_t link_bw, rate_select;
@@ -182,7 +183,6 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp) max_cr_tries =80 ; voltage_tries =1 ; - max_vswing_tries =0 ;for (cr_tries =0 ; cr_tries < max_cr_tries; ++cr_tries) {uint8_t link_status[DP_LINK_STATUS_SIZE ];
@@ -203,7 +203,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)return false; } -if (max_vswing_tries ==1 ) { +if (max_vswing_reached) {DRM_DEBUG_KMS ("Max Voltage Swing reached\n" );return false; }
@@ -224,7 +224,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp) voltage_tries =1 ;if (intel_dp_link_max_vswing_reached (intel_dp)) - ++max_vswing_tries; + max_vswing_reached = true; }DRM_ERROR ("Failed clock recovery %d times, giving up!\n" , max_cr_tries);
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [CI,1/2] drm/i915/dp: Limit link training clock recovery loop
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: series starting with [CI,1/2] drm/i915/dp: Limit link training clock recovery loop
URL : https://patchwork.freedesktop.org/series/46992/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4521 -> Patchwork_9740 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/46992/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9740:
=== IGT changes ===
==== Possible regressions ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
{fi-cfl-8109u}: PASS -> INCOMPLETE {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
== Participating hosts (47 -> 42) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4521 -> Patchwork_9740
CI_DRM_4521: a4ebbd84c682fd30edbde6ac0e48d150d4c5c066 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4570: 65cdccdc7bcbb791d791aeeeecb784a382110a3c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9740: 5ef35ff56fb327ef9636123ad27755fffdd06f59 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5ef35ff56fb3 drm/i915/dp: Refactor max_vswing_tries variable cd42a90b0a51 drm/i915/dp: Limit link training clock recovery loop
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9740/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [CI,1/2] drm/i915/dp: Limit link training clock recovery loop
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: series starting with [CI,1/2] drm/i915/dp: Limit link training clock recovery loop
URL : https://patchwork.freedesktop.org/series/46992/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4521_full -> Patchwork_9740_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9740_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9740_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9740_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@deep-bsd1:
shard-kbl: PASS -> SKIP +1
igt@gem_exec_schedule@deep-bsd2:
shard-kbl: SKIP -> PASS +1== Known issues ==
Here are the changes found in Patchwork_9740_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_suspend@shrink:
shard-apl: PASS -> INCOMPLETE (fdo#103927, fdo#106886)
igt@kms_flip@2x-plain-flip-fb-recreate:
shard-glk: PASS -> FAIL (fdo#100368)
igt@kms_rotation_crc@primary-rotation-180:
shard-apl: PASS -> FAIL (fdo#103925)
igt@perf_pmu@multi-client-vcs1:
shard-snb: SKIP -> INCOMPLETE (fdo#105411)
==== Possible fixes ====
igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
shard-hsw: FAIL (fdo#105767) -> PASS
igt@kms_flip@dpms-vs-vblank-race:
shard-glk: FAIL (fdo#103060) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105767 https://bugs.freedesktop.org/show_bug.cgi?id=105767
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4521 -> Patchwork_9740
CI_DRM_4521: a4ebbd84c682fd30edbde6ac0e48d150d4c5c066 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4570: 65cdccdc7bcbb791d791aeeeecb784a382110a3c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9740: 5ef35ff56fb327ef9636123ad27755fffdd06f59 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9740/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx