Skip to contentSkip to conversation

drm/i915/dp: Validate cached link rate and lane count before retraining

PATCH Superseded Manasi Navare 4 participants 9 messages Mar 23, 2017 – Mar 28, 2017

Subsystems (2)

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/dp: Validate cached link rate and lane count before retraining

Currently intel_dp_check_link_status() tries to retrain the link if Clock recovery or Channel EQ for any of the lanes indicated by intel_dp->lane_count is not set. However these values cached in intel_dp structure can be stale if link training has failed for these values during previous modeset. Or these values can get stale since we have now re read the DPCD registers or it can be 0 in case of connected boot case.

This patch validates these values against the common_rates and max lane count values.

This is absolutely required incase the common_rates or max lane count are now different due to link fallback.

Cc Ville Syrjala <[email protected]>
Cc Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +21 -3
index fd96a6c..51fa6b5 100644
@@ -295,6 +295,23 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp,
 	return -1;
 }
 
+static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp)
+{
+	int common_rates[DP_MAX_SUPPORTED_RATES];
+	int link_rate_index;
+
+	link_rate_index = intel_dp_link_rate_index(intel_dp,
+						   common_rates,
+						   intel_dp->link_rate);
+	if (link_rate_index < 0)
+		return false;
+	if (!intel_dp->lane_count ||
+	    (intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)))
+		return false;
+
+	return true;
+}
+
 int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp,
 					    int link_rate, uint8_t lane_count)
 {
@@ -4224,9 +4241,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
 	if (!to_intel_crtc(intel_encoder->base.crtc)->active)
 		return;
 
-	/* FIXME: we need to synchronize this sort of stuff with hardware
-	 * readout. Currently fast link training doesn't work on boot-up. */
-	if (!intel_dp->lane_count)
+	/* Validate the cached values of intel_dp->link_rate and
+	 * intel_dp->lane_count before attempting to retrain.
+	 */
+	if (!intel_dp_link_params_is_valid(intel_dp))
 		return;
 
 	/* Retrain if Channel EQ or CR not ok */
Signature · 6 lines
2.1.4

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

✓ Fi.CI.BAT: success for drm/i915/dp: Validate cached link rate and lane count before retraining

== Series Details ==

== Series Details ==

Series: drm/i915/dp: Validate cached link rate and lane count before retraining
URL : https://patchwork.freedesktop.org/series/21797/
State : success

== Summary ==

Series 21797v1 drm/i915/dp: Validate cached link rate and lane count before retraining
https://patchwork.freedesktop.org/api/1.0/series/21797/revisions/1/mbox/

Test kms_pipe_crc_basic:

        Subgroup suspend-read-crc-pipe-c:
                pass       -> INCOMPLETE (fi-bsw-n3050) fdo#100113

fdo#100113 https://bugs.freedesktop.org/show_bug.cgi?id=100113

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time: 467s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time: 454s
fi-bsw-n3050     total:237  pass:201  dwarn:0   dfail:0   fail:0   skip:35  time: 0s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time: 545s
fi-bxt-t5700     total:278  pass:258  dwarn:0   dfail:0   fail:0   skip:20  time: 562s
fi-byt-j1900     total:278  pass:251  dwarn:0   dfail:0   fail:0   skip:27  time: 508s
fi-byt-n2820     total:278  pass:247  dwarn:0   dfail:0   fail:0   skip:31  time: 503s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time: 433s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time: 437s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time: 440s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 511s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 496s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 476s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time: 486s
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17  time: 601s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time: 490s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time: 526s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time: 464s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time: 549s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time: 416s

fd27e1e4c9b5dc11966b4953432bd6e0510da308 drm-tip: 2017y-03m-24d-08h-39m-20s UTC integration manifest 44ec18c drm/i915/dp: Validate cached link rate and lane count before retraining

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4286/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
In reply to Manasi Navare
Quoted 27 lines · Manasi Navare

Currently intel_dp_check_link_status() tries to retrain the link if Clock recovery or Channel EQ for any of the lanes indicated by intel_dp->lane_count is not set. However these values cached in intel_dp structure can be stale if link training has failed for these values during previous modeset. Or these values can get stale since we have now re read the DPCD registers or it can be 0 in case of connected boot case.

This patch validates these values against the common_rates and max lane count values.

This is absolutely required incase the common_rates or max lane count are now different due to link fallback.

Cc Ville Syrjala <[email protected]>
Cc Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +0 -0
index fd96a6c..51fa6b5 100644
@@ -295,6 +295,23 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp,
 	return -1;

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_link_rate_index(struct intel_dp *intel_dp, · line 305

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +8 -0
 }
 
+static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp)
+{
+	int common_rates[DP_MAX_SUPPORTED_RATES];
+	int link_rate_index;
+
+	link_rate_index = intel_dp_link_rate_index(intel_dp,
+						   common_rates,
+						   intel_dp->link_rate);

Hmm. I thought we started to store the common rates somewhere more permanent, or did I imagine that?

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_link_rate_index(struct intel_dp *intel_dp, · line 309

Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
+	if (link_rate_index < 0)
+		return false;
+	if (!intel_dp->lane_count ||
+	    (intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)))

Needless parens.

Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +5 -0
+		return false;
+
+	return true;
+}
+
 int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp,
 					    int link_rate, uint8_t lane_count)
 {

drivers/gpu/drm/i915/intel_dp.c intel_dp_check_link_status(struct intel_dp *intel_dp) · line 4228

Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +0 -2
@@ -4224,9 +4241,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
 	if (!to_intel_crtc(intel_encoder->base.crtc)->active)
 		return;
 
-	/* FIXME: we need to synchronize this sort of stuff with hardware
-	 * readout. Currently fast link training doesn't work on boot-up. */

You shouldn't remove the FIXME. It's still totally valid.

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +4 -1
-	if (!intel_dp->lane_count)
+	/* Validate the cached values of intel_dp->link_rate and
+	 * intel_dp->lane_count before attempting to retrain.
+	 */
+	if (!intel_dp_link_params_is_valid(intel_dp))
 		return;
 
 	/* Retrain if Channel EQ or CR not ok */
Signature · 1 line
2.1.4
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#3 lore raw
Quoted 30 lines · Ville Syrjälä
Quoted 29 lines · Manasi Navare

Currently intel_dp_check_link_status() tries to retrain the link if Clock recovery or Channel EQ for any of the lanes indicated by intel_dp->lane_count is not set. However these values cached in intel_dp structure can be stale if link training has failed for these values during previous modeset. Or these values can get stale since we have now re read the DPCD registers or it can be 0 in case of connected boot case.

This patch validates these values against the common_rates and max lane count values.

This is absolutely required incase the common_rates or max lane count are now different due to link fallback.

Cc Ville Syrjala <[email protected]>
Cc Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +0 -0
index fd96a6c..51fa6b5 100644
@@ -295,6 +295,23 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp,
 	return -1;
 }
 
Quoted 11 lines

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_link_rate_index(struct intel_dp *intel_dp, · line 305

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +8 -0
+static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp)
+{
+	int common_rates[DP_MAX_SUPPORTED_RATES];
+	int link_rate_index;
+
+	link_rate_index = intel_dp_link_rate_index(intel_dp,
+						   common_rates,
+						   intel_dp->link_rate);

Hmm. I thought we started to store the common rates somewhere more permanent, or did I imagine that?

That series got stalled waiting for Manasi's stuff to land... which means it's now conflicting and pending rebase, and still waiting. :(

J.

Quoted 35 lines

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_link_rate_index(struct intel_dp *intel_dp, · line 309

Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
+	if (link_rate_index < 0)
+		return false;
+	if (!intel_dp->lane_count ||
+	    (intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)))

Needless parens.

Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +5 -0
+		return false;
+
+	return true;
+}
+
 int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp,
 					    int link_rate, uint8_t lane_count)
 {

drivers/gpu/drm/i915/intel_dp.c intel_dp_check_link_status(struct intel_dp *intel_dp) · line 4228

Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +0 -2
@@ -4224,9 +4241,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
 	if (!to_intel_crtc(intel_encoder->base.crtc)->active)
 		return;
 
-	/* FIXME: we need to synchronize this sort of stuff with hardware
-	 * readout. Currently fast link training doesn't work on boot-up. */

You shouldn't remove the FIXME. It's still totally valid.

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +4 -1
-	if (!intel_dp->lane_count)
+	/* Validate the cached values of intel_dp->link_rate and
+	 * intel_dp->lane_count before attempting to retrain.
+	 */
+	if (!intel_dp_link_params_is_valid(intel_dp))
 		return;
 
 	/* Retrain if Channel EQ or CR not ok */
Signature · 1 line
2.1.4
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 43 lines · Jani Nikula
Quoted 30 lines · Ville Syrjälä
Quoted 29 lines · Manasi Navare

Currently intel_dp_check_link_status() tries to retrain the link if Clock recovery or Channel EQ for any of the lanes indicated by intel_dp->lane_count is not set. However these values cached in intel_dp structure can be stale if link training has failed for these values during previous modeset. Or these values can get stale since we have now re read the DPCD registers or it can be 0 in case of connected boot case.

This patch validates these values against the common_rates and max lane count values.

This is absolutely required incase the common_rates or max lane count are now different due to link fallback.

Cc Ville Syrjala <[email protected]>
Cc Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +0 -0
index fd96a6c..51fa6b5 100644
@@ -295,6 +295,23 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp,
 	return -1;
 }
 
Quoted 11 lines

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_link_rate_index(struct intel_dp *intel_dp, · line 305

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +8 -0
+static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp)
+{
+	int common_rates[DP_MAX_SUPPORTED_RATES];
+	int link_rate_index;
+
+	link_rate_index = intel_dp_link_rate_index(intel_dp,
+						   common_rates,
+						   intel_dp->link_rate);

Hmm. I thought we started to store the common rates somewhere more permanent, or did I imagine that?

Quoted 5 lines

That series got stalled waiting for Manasi's stuff to land... which means it's now conflicting and pending rebase, and still waiting. :(

J.

Hmm, yes but if you want I can work on rebasing it after these two patches land. That series is really required.

Quoted 9 lines
Quoted 9 lines

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_link_rate_index(struct intel_dp *intel_dp, · line 309

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
+	if (link_rate_index < 0)
+		return false;
+	if (!intel_dp->lane_count ||
+	    (intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)))

Needless parens.

Ok, will remove that.

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/i915/intel_dp.c +5 -0
+		return false;
+
+	return true;
+}
+
 int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp,
 					    int link_rate, uint8_t lane_count)
 {
@@ -4224,9 +4241,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
 	if (!to_intel_crtc(intel_encoder->base.crtc)->active)
 		return;
 
Quoted 5 lines
Quoted 5 lines

drivers/gpu/drm/i915/intel_dp.c intel_dp_check_link_status(struct intel_dp *intel_dp) · line 4228

Quoted 2 lines
drivers/gpu/drm/i915/intel_dp.c +0 -2
-	/* FIXME: we need to synchronize this sort of stuff with hardware
-	 * readout. Currently fast link training doesn't work on boot-up. */

You shouldn't remove the FIXME. It's still totally valid.

But that check is now incorporated in validating the params. So why is separate check required?
Or are you just saying leave the FIXME comment?

Manasi

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +4 -1
-	if (!intel_dp->lane_count)
+	/* Validate the cached values of intel_dp->link_rate and
+	 * intel_dp->lane_count before attempting to retrain.
+	 */
+	if (!intel_dp_link_params_is_valid(intel_dp))
 		return;
 
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +0 -0
 	/* Retrain if Channel EQ or CR not ok */
Signature · 1 line
2.1.4
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center

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

#5 lore raw
Quoted 85 lines · Manasi Navare
Quoted 43 lines · Jani Nikula
Quoted 30 lines · Ville Syrjälä
Quoted 29 lines · Manasi Navare

Currently intel_dp_check_link_status() tries to retrain the link if Clock recovery or Channel EQ for any of the lanes indicated by intel_dp->lane_count is not set. However these values cached in intel_dp structure can be stale if link training has failed for these values during previous modeset. Or these values can get stale since we have now re read the DPCD registers or it can be 0 in case of connected boot case.

This patch validates these values against the common_rates and max lane count values.

This is absolutely required incase the common_rates or max lane count are now different due to link fallback.

Cc Ville Syrjala <[email protected]>
Cc Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +0 -0
index fd96a6c..51fa6b5 100644
@@ -295,6 +295,23 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp,
 	return -1;
 }
 
Quoted 11 lines

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_link_rate_index(struct intel_dp *intel_dp, · line 305

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +8 -0
+static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp)
+{
+	int common_rates[DP_MAX_SUPPORTED_RATES];
+	int link_rate_index;
+
+	link_rate_index = intel_dp_link_rate_index(intel_dp,
+						   common_rates,
+						   intel_dp->link_rate);

Hmm. I thought we started to store the common rates somewhere more permanent, or did I imagine that?

Quoted 5 lines

That series got stalled waiting for Manasi's stuff to land... which means it's now conflicting and pending rebase, and still waiting. :(

J.

Hmm, yes but if you want I can work on rebasing it after these two patches land. That series is really required.

Quoted 9 lines
Quoted 9 lines

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_link_rate_index(struct intel_dp *intel_dp, · line 309

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
+	if (link_rate_index < 0)
+		return false;
+	if (!intel_dp->lane_count ||
+	    (intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)))

Needless parens.

Ok, will remove that.

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/i915/intel_dp.c +5 -0
+		return false;
+
+	return true;
+}
+
 int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp,
 					    int link_rate, uint8_t lane_count)
 {
@@ -4224,9 +4241,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
 	if (!to_intel_crtc(intel_encoder->base.crtc)->active)
 		return;
 
Quoted 5 lines
Quoted 5 lines

drivers/gpu/drm/i915/intel_dp.c intel_dp_check_link_status(struct intel_dp *intel_dp) · line 4228

Quoted 2 lines
drivers/gpu/drm/i915/intel_dp.c +0 -2
-	/* FIXME: we need to synchronize this sort of stuff with hardware
-	 * readout. Currently fast link training doesn't work on boot-up. */

You shouldn't remove the FIXME. It's still totally valid.

Quoted 3 lines

But that check is now incorporated in validating the params. So why is separate check required?
Or are you just saying leave the FIXME comment?

Yes, leave the comment. Or better yet, move into intel_dp_link_params_is_valid() and maybe reword a bit to something like:

"FIXME: we need to synchronize the current link parameters with hardware readout ..."

to make it it clear that it's actually referring to the current link params and not something else.

Quoted 17 lines

Manasi

Quoted 13 lines
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +4 -1
-	if (!intel_dp->lane_count)
+	/* Validate the cached values of intel_dp->link_rate and
+	 * intel_dp->lane_count before attempting to retrain.
+	 */
+	if (!intel_dp_link_params_is_valid(intel_dp))
 		return;
 
 	/* Retrain if Channel EQ or CR not ok */
Signature · 1 line
2.1.4
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
Quoted 94 lines · Ville Syrjälä
Quoted 85 lines · Manasi Navare
Quoted 43 lines · Jani Nikula
Quoted 30 lines · Ville Syrjälä
Quoted 29 lines · Manasi Navare

Currently intel_dp_check_link_status() tries to retrain the link if Clock recovery or Channel EQ for any of the lanes indicated by intel_dp->lane_count is not set. However these values cached in intel_dp structure can be stale if link training has failed for these values during previous modeset. Or these values can get stale since we have now re read the DPCD registers or it can be 0 in case of connected boot case.

This patch validates these values against the common_rates and max lane count values.

This is absolutely required incase the common_rates or max lane count are now different due to link fallback.

Cc Ville Syrjala <[email protected]>
Cc Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +0 -0
index fd96a6c..51fa6b5 100644
@@ -295,6 +295,23 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp,
 	return -1;
 }
 
Quoted 11 lines

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_link_rate_index(struct intel_dp *intel_dp, · line 305

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +8 -0
+static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp)
+{
+	int common_rates[DP_MAX_SUPPORTED_RATES];
+	int link_rate_index;
+
+	link_rate_index = intel_dp_link_rate_index(intel_dp,
+						   common_rates,
+						   intel_dp->link_rate);

Hmm. I thought we started to store the common rates somewhere more permanent, or did I imagine that?

Quoted 5 lines

That series got stalled waiting for Manasi's stuff to land... which means it's now conflicting and pending rebase, and still waiting. :(

J.

Hmm, yes but if you want I can work on rebasing it after these two patches land. That series is really required.

Quoted 9 lines
Quoted 9 lines

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_link_rate_index(struct intel_dp *intel_dp, · line 309

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
+	if (link_rate_index < 0)
+		return false;
+	if (!intel_dp->lane_count ||
+	    (intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)))

Needless parens.

Ok, will remove that.

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/i915/intel_dp.c +5 -0
+		return false;
+
+	return true;
+}
+
 int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp,
 					    int link_rate, uint8_t lane_count)
 {
@@ -4224,9 +4241,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
 	if (!to_intel_crtc(intel_encoder->base.crtc)->active)
 		return;
 
Quoted 5 lines
Quoted 5 lines

drivers/gpu/drm/i915/intel_dp.c intel_dp_check_link_status(struct intel_dp *intel_dp) · line 4228

Quoted 2 lines
drivers/gpu/drm/i915/intel_dp.c +0 -2
-	/* FIXME: we need to synchronize this sort of stuff with hardware
-	 * readout. Currently fast link training doesn't work on boot-up. */

You shouldn't remove the FIXME. It's still totally valid.

Quoted 3 lines

But that check is now incorporated in validating the params. So why is separate check required?
Or are you just saying leave the FIXME comment?

Yes, leave the comment. Or better yet, move into intel_dp_link_params_is_valid() and maybe reword a bit to something like:

Quoted 7 lines

"FIXME: we need to synchronize the current link parameters with hardware readout ..."

to make it it clear that it's actually referring to the current link params and not something else.

Ok, I will move the comment into the function. And submit a new revision. Everything else looks good?

Regards
Manasi

Quoted 11 lines
Quoted 11 lines

Manasi

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +4 -1
-	if (!intel_dp->lane_count)
+	/* Validate the cached values of intel_dp->link_rate and
+	 * intel_dp->lane_count before attempting to retrain.
+	 */
+	if (!intel_dp_link_params_is_valid(intel_dp))
 		return;
 
Quoted 10 lines
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +0 -0
 	/* Retrain if Channel EQ or CR not ok */
Signature · 1 line
2.1.4
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 2 lines
Ville Syrjälä
Intel OTC

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

maintainer
#7 lore raw
In reply to Manasi Navare
Quoted 2 lines · Manasi Navare

Hmm, yes but if you want I can work on rebasing it after these two patches land. That series is really required.

I can do the rebasing, I'll just need the review from you. ;)

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw
Quoted 6 lines · Jani Nikula
Quoted 2 lines · Manasi Navare

Hmm, yes but if you want I can work on rebasing it after these two patches land. That series is really required.

I can do the rebasing, I'll just need the review from you. ;)

Yes absolutely, i will review it today. I had looked at this and tested it earlier as well.

So I submitted v2 for Validate link params patch yesterday, that would have to be rebased?

And how about the Implement link rate fallback patch? Does that need to be rebased?

Regards
Manasi

Quoted 5 lines

BR,
Jani.

Signature · 1 line
Jani Nikula, Intel Open Source Technology Center

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