Skip to contentSkip to conversation

drm/i915: Adaptive backoff delay on link training

PATCH In review Mika Kuoppala 4 participants 6 messages Feb 26, 2016 – Mar 16, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Adaptive backoff delay on link training

If the panel don't give us the information how long to wait before starting a new link training phase, it is not productive to poke it at 100us or 400us intervals and then give up if it fails to respond in time. Instead gradually increase the training delay so that we reach the slower kind and get display up.

This was needed to reach panel:

0000: 12 14 c4 41 00 00 01 c0 02 00 00 00 1f 0b 00 0070: 01 00
0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0100: 14 84 00 00 00 00 00 00 01 10 00
0200: 01 00 00 00 80 00 00 00
0600: 01
0700: 02
0701: b7 f6 00 00
0720: 00 04 02 00 0a 04 0a 00 1b 00 00 01 00 ff ff 03 0732: 04 10

on kbl (8086:591e)

Cc Ander Conselvan de Oliveira <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Mika Kahola <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp_link_training.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp_link_training.c +18 -3
index 0b8eefc2acc5..aec81e28e347 100644
@@ -104,6 +104,19 @@ intel_dp_update_link_train(struct intel_dp *intel_dp)
 	return ret == intel_dp->lane_count;
 }
 
+static void intel_dp_link_training_delay(struct intel_dp *intel_dp,
+					 int retry_count)
+{
+	if (intel_dp->dpcd[DP_TRAINING_AUX_RD_INTERVAL]) {
+		mdelay(intel_dp->dpcd[DP_TRAINING_AUX_RD_INTERVAL] * 4);
+	} else {
+		if (retry_count)
+			mdelay(retry_count * 4);
+		else
+			udelay(400);
+	}
+}
+
 /* Enable corresponding port and start training pattern 1 */
 static void
 intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
@@ -150,7 +163,8 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
 	for (;;) {
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
-		drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd);
+		intel_dp_link_training_delay(intel_dp, loop_tries);
+
 		if (!intel_dp_get_link_status(intel_dp, link_status)) {
 			DRM_ERROR("failed to get link status\n");
 			break;
@@ -184,7 +198,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
 				break;
 		if (i == intel_dp->lane_count) {
 			++loop_tries;
-			if (loop_tries == 5) {
+			if (loop_tries == 10) {
 				DRM_ERROR("too many full retries, give up\n");
 				break;
 			}
@@ -275,7 +289,8 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 			break;
 		}
 
-		drm_dp_link_train_channel_eq_delay(intel_dp->dpcd);
+		intel_dp_link_training_delay(intel_dp, cr_tries);
+
 		if (!intel_dp_get_link_status(intel_dp, link_status)) {
 			DRM_ERROR("failed to get link status\n");
 			break;
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Adaptive backoff delay on link training

== Series Details ==

== Series Details ==

Series: drm/i915: Adaptive backoff delay on link training
URL : https://patchwork.freedesktop.org/series/3843/
State : failure

== Summary ==

Series 3843v1 drm/i915: Adaptive backoff delay on link training
http://patchwork.freedesktop.org/api/1.0/series/3843/revisions/1/mbox/

Test kms_force_connector_basic:

        Subgroup force-load-detect:
                dmesg-fail -> FAIL       (hsw-gt2)
Test pm_rpm:
        Subgroup basic-rte:
                pass       -> FAIL       (hsw-gt2)
                fail       -> PASS       (bdw-nuci7)
                fail       -> PASS       (bdw-ultra)
bdw-nuci7        total:165  pass:154  dwarn:0   dfail:0   fail:0   skip:11 
bdw-ultra        total:168  pass:154  dwarn:0   dfail:0   fail:0   skip:14 
bsw-nuc-2        total:168  pass:137  dwarn:0   dfail:0   fail:1   skip:30 
hsw-brixbox      total:168  pass:154  dwarn:0   dfail:0   fail:0   skip:14 
hsw-gt2          total:168  pass:156  dwarn:0   dfail:0   fail:2   skip:10 
ilk-hp8440p      total:168  pass:118  dwarn:0   dfail:1   fail:0   skip:49 
ivb-t430s        total:168  pass:153  dwarn:0   dfail:0   fail:1   skip:14 
skl-i7k-2        total:168  pass:151  dwarn:1   dfail:0   fail:0   skip:16 
snb-dellxps      total:168  pass:145  dwarn:0   dfail:0   fail:1   skip:22 
snb-x220t        total:168  pass:145  dwarn:0   dfail:0   fail:2   skip:21 

Results at /archive/results/CI_IGT_test/Patchwork_1480/

38f0cd5314ecb02d15d019631e388d3642275600 drm-intel-nightly: 2016y-02m-25d-15h-33m-53s UTC integration manifest bfac725986e5c5f2982d943f0e7f43fa2ceab082 drm/i915: Adaptive backoff delay on link training

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
In reply to Mika Kuoppala

(Cc'ing Sivakumar, as he might have some ideas on this)

Quoted 19 lines · Mika Kuoppala

If the panel don't give us the information how long to wait before starting a new link training phase, it is not productive to poke it at 100us or 400us intervals and then give up if it fails to respond in time. Instead gradually increase the training delay so that we reach the slower kind and get display up.

This was needed to reach panel:

0000: 12 14 c4 41 00 00 01 c0 02 00 00 00 1f 0b 00 0070: 01 00
0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0100: 14 84 00 00 00 00 00 00 01 10 00
0200: 01 00 00 00 80 00 00 00
0600: 01
0700: 02
0701: b7 f6 00 00
0720: 00 04 02 00 0a 04 0a 00 1b 00 00 01 00 ff ff 03 0732: 04 10

Quoted 1 line

on kbl (8086:591e)

I poked at the machine in question. Here's what I found out:

- having the delay fixed at 16ms with all the retries in this patch is enough to achieve clock recovery;
- forcing different iboost levels doesn't reduce the number of tries done with the code in this patch;
- clock recovery fails because lane 0 fails to achieve clock recovery most of the time, while the other lanes succeed.

The log below was obtained with a patch to log the link status after each clock recovery delay.

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 12 11 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 10 80 00 22 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 11 10 80 00 11 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 11 11 80 00 22 22 [drm:intel_dp_link_training_clock_recovery] clock recovery OK [drm:intel_dp_link_training_channel_equalization] link status: 11 11 80 00 66
66
[drm:intel_dp_set_signal_levels] Using signal levels 08000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 1 [drm:intel_dp_link_training_channel_equalization] link status: 77 77 81 01 66
66
[drm:intel_dp_link_training_channel_equalization] Channel EQ done. DP Training
successful

Ander

Quoted 66 lines
Cc Ander Conselvan de Oliveira <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Mika Kahola <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp_link_training.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp_link_training.c +15 -1
index 0b8eefc2acc5..aec81e28e347 100644
@@ -104,6 +104,19 @@ intel_dp_update_link_train(struct intel_dp *intel_dp)
 	return ret == intel_dp->lane_count;
 }
 
+static void intel_dp_link_training_delay(struct intel_dp *intel_dp,
+					 int retry_count)
+{
+	if (intel_dp->dpcd[DP_TRAINING_AUX_RD_INTERVAL]) {
+		mdelay(intel_dp->dpcd[DP_TRAINING_AUX_RD_INTERVAL] * 4);
+	} else {
+		if (retry_count)
+			mdelay(retry_count * 4);
+		else
+			udelay(400);
+	}
+}
+
 /* Enable corresponding port and start training pattern 1 */
 static void
 intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
@@ -150,7 +163,8 @@ intel_dp_link_training_clock_recovery(struct intel_dp
 *intel_dp)
 	for (;;) {
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
-		drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd);
+		intel_dp_link_training_delay(intel_dp, loop_tries);
+
 		if (!intel_dp_get_link_status(intel_dp, link_status)) {
 			DRM_ERROR("failed to get link status\n");
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 			break;
@@ -184,7 +198,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp
 *intel_dp)
 				break;
 		if (i == intel_dp->lane_count) {
 			++loop_tries;
-			if (loop_tries == 5) {
+			if (loop_tries == 10) {
 				DRM_ERROR("too many full retries, give
 up\n");
drivers/gpu/drm/i915/intel_dp_link_training.c +2 -1
 				break;
 			}
@@ -275,7 +289,8 @@ intel_dp_link_training_channel_equalization(struct
 intel_dp *intel_dp)
 			break;
 		}
 
-		drm_dp_link_train_channel_eq_delay(intel_dp->dpcd);
+		intel_dp_link_training_delay(intel_dp, cr_tries);
+
 		if (!intel_dp_get_link_status(intel_dp, link_status)) {
 			DRM_ERROR("failed to get link status\n");
Quoted 1 line

break;

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
Quoted 22 lines · Ander Conselvan De Oliveira

(Cc'ing Sivakumar, as he might have some ideas on this)

Quoted 19 lines · Mika Kuoppala

If the panel don't give us the information how long to wait before starting a new link training phase, it is not productive to poke it at 100us or 400us intervals and then give up if it fails to respond in time. Instead gradually increase the training delay so that we reach the slower kind and get display up.

This was needed to reach panel:

0000: 12 14 c4 41 00 00 01 c0 02 00 00 00 1f 0b 00 0070: 01 00
0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0100: 14 84 00 00 00 00 00 00 01 10 00
0200: 01 00 00 00 80 00 00 00
0600: 01
0700: 02
0701: b7 f6 00 00
0720: 00 04 02 00 0a 04 0a 00 1b 00 00 01 00 ff ff 03 0732: 04 10

Quoted 8 lines
Quoted 1 line

on kbl (8086:591e)

I poked at the machine in question. Here's what I found out:

- having the delay fixed at 16ms with all the retries in this patch is enough to achieve clock recovery;
- forcing different iboost levels doesn't reduce the number of tries done with the code in this patch;

Did you try low vswing vs. not?

Quoted 240 lines

- clock recovery fails because lane 0 fails to achieve clock recovery most of the time, while the other lanes succeed.

The log below was obtained with a patch to log the link status after each clock recovery delay.

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 12 11 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 10 80 00 22 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 11 10 80 00 11 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 11 11 80 00 22 22 [drm:intel_dp_link_training_clock_recovery] clock recovery OK [drm:intel_dp_link_training_channel_equalization] link status: 11 11 80 00 66
66
[drm:intel_dp_set_signal_levels] Using signal levels 08000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 1 [drm:intel_dp_link_training_channel_equalization] link status: 77 77 81 01 66
66
[drm:intel_dp_link_training_channel_equalization] Channel EQ done. DP Training
successful

Ander

Quoted 66 lines
Cc Ander Conselvan de Oliveira <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Mika Kahola <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp_link_training.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp_link_training.c +15 -1
index 0b8eefc2acc5..aec81e28e347 100644
@@ -104,6 +104,19 @@ intel_dp_update_link_train(struct intel_dp *intel_dp)
 	return ret == intel_dp->lane_count;
 }
 
+static void intel_dp_link_training_delay(struct intel_dp *intel_dp,
+					 int retry_count)
+{
+	if (intel_dp->dpcd[DP_TRAINING_AUX_RD_INTERVAL]) {
+		mdelay(intel_dp->dpcd[DP_TRAINING_AUX_RD_INTERVAL] * 4);
+	} else {
+		if (retry_count)
+			mdelay(retry_count * 4);
+		else
+			udelay(400);
+	}
+}
+
 /* Enable corresponding port and start training pattern 1 */
 static void
 intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
@@ -150,7 +163,8 @@ intel_dp_link_training_clock_recovery(struct intel_dp
 *intel_dp)
 	for (;;) {
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
-		drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd);
+		intel_dp_link_training_delay(intel_dp, loop_tries);
+
 		if (!intel_dp_get_link_status(intel_dp, link_status)) {
 			DRM_ERROR("failed to get link status\n");
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 			break;
@@ -184,7 +198,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp
 *intel_dp)
 				break;
 		if (i == intel_dp->lane_count) {
 			++loop_tries;
-			if (loop_tries == 5) {
+			if (loop_tries == 10) {
 				DRM_ERROR("too many full retries, give
 up\n");
drivers/gpu/drm/i915/intel_dp_link_training.c +2 -1
 				break;
 			}
@@ -275,7 +289,8 @@ intel_dp_link_training_channel_equalization(struct
 intel_dp *intel_dp)
 			break;
 		}
 
-		drm_dp_link_train_channel_eq_delay(intel_dp->dpcd);
+		intel_dp_link_training_delay(intel_dp, cr_tries);
+
 		if (!intel_dp_get_link_status(intel_dp, link_status)) {
 			DRM_ERROR("failed to get link status\n");
Quoted 1 line

break;

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 27 lines · Ville Syrjälä
Quoted 26 lines · Ander Conselvan De Oliveira

(Cc'ing Sivakumar, as he might have some ideas on this)

Quoted 19 lines · Mika Kuoppala

If the panel don't give us the information how long to wait before starting a new link training phase, it is not productive to poke it at 100us or 400us intervals and then give up if it fails to respond in time. Instead gradually increase the training delay so that we reach the slower kind and get display up.

This was needed to reach panel:

0000: 12 14 c4 41 00 00 01 c0 02 00 00 00 1f 0b 00 0070: 01 00
0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0100: 14 84 00 00 00 00 00 00 01 10 00
0200: 01 00 00 00 80 00 00 00
0600: 01
0700: 02
0701: b7 f6 00 00
0720: 00 04 02 00 0a 04 0a 00 1b 00 00 01 00 ff ff 03 0732: 04 10

Quoted 1 line

on kbl (8086:591e)

I poked at the machine in question. Here's what I found out:

Quoted 8 lines
Quoted 6 lines

- having the delay fixed at 16ms with all the retries in this patch is enough to
achieve clock recovery;
- forcing different iboost levels doesn't reduce the number of tries done with
the code in this patch;

Did you try low vswing vs. not?

I completely missed that. Judging from the log below, dev_priv->edp_low_vswing was set by the bios, since vswing level 3 is being used. Should try booting with i915.edp_vswing=2.

Ander

Quoted 235 lines
Quoted 235 lines

- clock recovery fails because lane 0 fails to achieve clock recovery most of
the time, while the other lanes succeed.

The log below was obtained with a patch to log the link status after each clock
recovery delay.

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 12 11 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 10 80 00 22 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 11 10 80 00 11 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 11 11 80 00 22 22 [drm:intel_dp_link_training_clock_recovery] clock recovery OK [drm:intel_dp_link_training_channel_equalization] link status: 11 11 80 00
66
66
[drm:intel_dp_set_signal_levels] Using signal levels 08000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 1 [drm:intel_dp_link_training_channel_equalization] link status: 77 77 81 01
66
66
[drm:intel_dp_link_training_channel_equalization] Channel EQ done. DP
Training
successful

Ander

Quoted 61 lines
Cc Ander Conselvan de Oliveira <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Mika Kahola <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp_link_training.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp_link_training.c +15 -1
index 0b8eefc2acc5..aec81e28e347 100644
@@ -104,6 +104,19 @@ intel_dp_update_link_train(struct intel_dp *intel_dp)
 	return ret == intel_dp->lane_count;
 }
 
+static void intel_dp_link_training_delay(struct intel_dp *intel_dp,
+					 int retry_count)
+{
+	if (intel_dp->dpcd[DP_TRAINING_AUX_RD_INTERVAL]) {
+		mdelay(intel_dp->dpcd[DP_TRAINING_AUX_RD_INTERVAL] * 4);
+	} else {
+		if (retry_count)
+			mdelay(retry_count * 4);
+		else
+			udelay(400);
+	}
+}
+
 /* Enable corresponding port and start training pattern 1 */
 static void
 intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
@@ -150,7 +163,8 @@ intel_dp_link_training_clock_recovery(struct intel_dp
 *intel_dp)
 	for (;;) {
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
-		drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd);
+		intel_dp_link_training_delay(intel_dp, loop_tries);
+
 		if (!intel_dp_get_link_status(intel_dp, link_status)) {
 			DRM_ERROR("failed to get link status\n");
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 			break;
@@ -184,7 +198,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp
 *intel_dp)
 				break;
 		if (i == intel_dp->lane_count) {
 			++loop_tries;
-			if (loop_tries == 5) {
+			if (loop_tries == 10) {
 				DRM_ERROR("too many full retries, give
 up\n");
drivers/gpu/drm/i915/intel_dp_link_training.c +0 -0
 				break;
 			}
@@ -275,7 +289,8 @@ intel_dp_link_training_channel_equalization(struct
 intel_dp *intel_dp)
 			break;
 		}
 
Quoted 11 lines
Quoted 10 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +2 -1
-		drm_dp_link_train_channel_eq_delay(intel_dp->dpcd);
+		intel_dp_link_training_delay(intel_dp, cr_tries);
+
 		if (!intel_dp_get_link_status(intel_dp, link_status)) {
 			DRM_ERROR("failed to get link status\n");

break;

_______________________________________________
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

#5 lore raw
Quoted 36 lines · Ander Conselvan De Oliveira

[ text/plain ]

Quoted 34 lines · Ville Syrjälä
Quoted 32 lines · Ander Conselvan De Oliveira

(Cc'ing Sivakumar, as he might have some ideas on this)

Quoted 19 lines · Mika Kuoppala

If the panel don't give us the information how long to wait before starting a new link training phase, it is not productive to poke it at 100us or 400us intervals and then give up if it fails to respond in time. Instead gradually increase the training delay so that we reach the slower kind and get display up.

This was needed to reach panel:

0000: 12 14 c4 41 00 00 01 c0 02 00 00 00 1f 0b 00 0070: 01 00
0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0100: 14 84 00 00 00 00 00 00 01 10 00
0200: 01 00 00 00 80 00 00 00
0600: 01
0700: 02
0701: b7 f6 00 00
0720: 00 04 02 00 0a 04 0a 00 1b 00 00 01 00 ff ff 03 0732: 04 10

Quoted 1 line

on kbl (8086:591e)

I poked at the machine in question. Here's what I found out:

- having the delay fixed at 16ms with all the retries in this patch is enough to
achieve clock recovery;
- forcing different iboost levels doesn't reduce the number of tries done with
the code in this patch;

Quoted 6 lines
Quoted 1 line

Did you try low vswing vs. not?

I completely missed that. Judging from the log below, dev_priv->edp_low_vswing was set by the bios, since vswing level 3 is being used. Should try booting with i915.edp_vswing=2.

With todays nightly and i915.edp_vswing=2 we get display.

This patch can be thus ignored.

-Mika

Quoted 248 lines

Ander

Quoted 246 lines
Quoted 245 lines

- clock recovery fails because lane 0 fails to achieve clock recovery most of
the time, while the other lanes succeed.

The log below was obtained with a patch to log the link status after each clock
recovery delay.

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 12 11 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 12 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 10 80 00 22 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 11 80 00 23 22 [drm:intel_dp_set_signal_levels] Using signal levels 09000000 [drm:intel_dp_set_signal_levels] Using vswing level 3 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 10 10 80 00 33 33

[drm:intel_dp_set_signal_levels] Using signal levels 00000000 [drm:intel_dp_set_signal_levels] Using vswing level 0 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 00 00 80 00 11 11 [drm:intel_dp_set_signal_levels] Using signal levels 04000000 [drm:intel_dp_set_signal_levels] Using vswing level 1 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 11 10 80 00 11 12 [drm:intel_dp_set_signal_levels] Using signal levels 07000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0 [drm:intel_dp_link_training_clock_recovery] link status: 11 11 80 00 22 22 [drm:intel_dp_link_training_clock_recovery] clock recovery OK [drm:intel_dp_link_training_channel_equalization] link status: 11 11 80 00
66
66
[drm:intel_dp_set_signal_levels] Using signal levels 08000000 [drm:intel_dp_set_signal_levels] Using vswing level 2 [drm:intel_dp_set_signal_levels] Using pre-emphasis level 1 [drm:intel_dp_link_training_channel_equalization] link status: 77 77 81 01
66
66
[drm:intel_dp_link_training_channel_equalization] Channel EQ done. DP
Training
successful

Ander

Quoted 66 lines
Cc Ander Conselvan de Oliveira <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Mika Kahola <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp_link_training.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp_link_training.c +15 -1
index 0b8eefc2acc5..aec81e28e347 100644
@@ -104,6 +104,19 @@ intel_dp_update_link_train(struct intel_dp *intel_dp)
 	return ret == intel_dp->lane_count;
 }
 
+static void intel_dp_link_training_delay(struct intel_dp *intel_dp,
+					 int retry_count)
+{
+	if (intel_dp->dpcd[DP_TRAINING_AUX_RD_INTERVAL]) {
+		mdelay(intel_dp->dpcd[DP_TRAINING_AUX_RD_INTERVAL] * 4);
+	} else {
+		if (retry_count)
+			mdelay(retry_count * 4);
+		else
+			udelay(400);
+	}
+}
+
 /* Enable corresponding port and start training pattern 1 */
 static void
 intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
@@ -150,7 +163,8 @@ intel_dp_link_training_clock_recovery(struct intel_dp
 *intel_dp)
 	for (;;) {
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
-		drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd);
+		intel_dp_link_training_delay(intel_dp, loop_tries);
+
 		if (!intel_dp_get_link_status(intel_dp, link_status)) {
 			DRM_ERROR("failed to get link status\n");
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 			break;
@@ -184,7 +198,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp
 *intel_dp)
 				break;
 		if (i == intel_dp->lane_count) {
 			++loop_tries;
-			if (loop_tries == 5) {
+			if (loop_tries == 10) {
 				DRM_ERROR("too many full retries, give
 up\n");
drivers/gpu/drm/i915/intel_dp_link_training.c +2 -1
 				break;
 			}
@@ -275,7 +289,8 @@ intel_dp_link_training_channel_equalization(struct
 intel_dp *intel_dp)
 			break;
 		}
 
-		drm_dp_link_train_channel_eq_delay(intel_dp->dpcd);
+		intel_dp_link_training_delay(intel_dp, cr_tries);
+
 		if (!intel_dp_get_link_status(intel_dp, link_status)) {
 			DRM_ERROR("failed to get link status\n");
Quoted 1 line

break;

_______________________________________________
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