v2 of https://patchwork.freedesktop.org/series/99324/
BR, Jani.
Jani Nikula (8): drm/dp: add drm_dp_128b132b_read_aux_rd_interval() drm/dp: add 128b/132b link status helpers from DP 2.0 E11 drm/dp: add some new DPCD macros from DP 2.0 E11 drm/i915/dp: move intel_dp_prepare_link_train() call drm/i915/dp: rewrite DP 2.0 128b/132b link training based on errata drm/i915/dp: add 128b/132b support to link status checks drm/i915/mst: update slot information for 128b/132b HACK: drm/i915/dp: give more time for CDS
drivers/gpu/drm/dp/drm_dp.c | 83 +++++ drivers/gpu/drm/i915/display/intel_dp.c | 39 ++- .../drm/i915/display/intel_dp_link_training.c | 288 +++++++++++++++++- .../drm/i915/display/intel_dp_link_training.h | 4 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 29 +- include/drm/dp/drm_dp_helper.h | 24 +- 6 files changed, 446 insertions(+), 21 deletions(-)
The DP 2.0 errata changes DP_128B132B_TRAINING_AUX_RD_INTERVAL (DPCD 0x2216) completely. Add a new function to read that. Follow-up will need to clean up existing functions.
v2: fix reversed interpretation of bit 7 meaning (Uma)
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com --- drivers/gpu/drm/dp/drm_dp.c | 20 ++++++++++++++++++++ include/drm/dp/drm_dp_helper.h | 3 +++ 2 files changed, 23 insertions(+)
diff --git a/drivers/gpu/drm/dp/drm_dp.c b/drivers/gpu/drm/dp/drm_dp.c index 6d43325acca5..52c6da510142 100644 --- a/drivers/gpu/drm/dp/drm_dp.c +++ b/drivers/gpu/drm/dp/drm_dp.c @@ -281,6 +281,26 @@ int drm_dp_read_channel_eq_delay(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIV } EXPORT_SYMBOL(drm_dp_read_channel_eq_delay);
+/* Per DP 2.0 Errata */ +int drm_dp_128b132b_read_aux_rd_interval(struct drm_dp_aux *aux) +{ + int unit; + u8 val; + + if (drm_dp_dpcd_readb(aux, DP_128B132B_TRAINING_AUX_RD_INTERVAL, &val) != 1) { + drm_err(aux->drm_dev, "%s: failed rd interval read\n", + aux->name); + /* default to max */ + val = DP_128B132B_TRAINING_AUX_RD_INTERVAL_MASK; + } + + unit = (val & DP_128B132B_TRAINING_AUX_RD_INTERVAL_1MS_UNIT) ? 1 : 2; + val &= DP_128B132B_TRAINING_AUX_RD_INTERVAL_MASK; + + return (val + 1) * unit * 1000; +} +EXPORT_SYMBOL(drm_dp_128b132b_read_aux_rd_interval); + void drm_dp_link_train_clock_recovery_delay(const struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]) { diff --git a/include/drm/dp/drm_dp_helper.h b/include/drm/dp/drm_dp_helper.h index 98d020835b49..aa73dfc817ff 100644 --- a/include/drm/dp/drm_dp_helper.h +++ b/include/drm/dp/drm_dp_helper.h @@ -1112,6 +1112,7 @@ struct drm_panel; # define DP_UHBR13_5 (1 << 2)
#define DP_128B132B_TRAINING_AUX_RD_INTERVAL 0x2216 /* 2.0 */ +# define DP_128B132B_TRAINING_AUX_RD_INTERVAL_1MS_UNIT (1 << 7) # define DP_128B132B_TRAINING_AUX_RD_INTERVAL_MASK 0x7f # define DP_128B132B_TRAINING_AUX_RD_INTERVAL_400_US 0x00 # define DP_128B132B_TRAINING_AUX_RD_INTERVAL_4_MS 0x01 @@ -1549,6 +1550,8 @@ void drm_dp_link_train_channel_eq_delay(const struct drm_dp_aux *aux, void drm_dp_lttpr_link_train_channel_eq_delay(const struct drm_dp_aux *aux, const u8 caps[DP_LTTPR_PHY_CAP_SIZE]);
+int drm_dp_128b132b_read_aux_rd_interval(struct drm_dp_aux *aux); + u8 drm_dp_link_rate_to_bw_code(int link_rate); int drm_dp_bw_code_to_link_rate(u8 link_bw);
The DP 2.0 errata redefines link training. There are some new status bits, and some of the old ones need to be checked independently. Add helpers to do this.
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- drivers/gpu/drm/dp/drm_dp.c | 63 ++++++++++++++++++++++++++++++++++ include/drm/dp/drm_dp_helper.h | 19 +++++++--- 2 files changed, 77 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/dp/drm_dp.c b/drivers/gpu/drm/dp/drm_dp.c index 52c6da510142..a20b0f8f24b8 100644 --- a/drivers/gpu/drm/dp/drm_dp.c +++ b/drivers/gpu/drm/dp/drm_dp.c @@ -144,6 +144,69 @@ u8 drm_dp_get_adjust_tx_ffe_preset(const u8 link_status[DP_LINK_STATUS_SIZE], } EXPORT_SYMBOL(drm_dp_get_adjust_tx_ffe_preset);
+/* DP 2.0 errata for 128b/132b */ +bool drm_dp_128b132b_lane_channel_eq_done(const u8 link_status[DP_LINK_STATUS_SIZE], + int lane_count) +{ + u8 lane_align, lane_status; + int lane; + + lane_align = dp_link_status(link_status, DP_LANE_ALIGN_STATUS_UPDATED); + if (!(lane_align & DP_INTERLANE_ALIGN_DONE)) + return false; + + for (lane = 0; lane < lane_count; lane++) { + lane_status = dp_get_lane_status(link_status, lane); + if (!(lane_status & DP_LANE_CHANNEL_EQ_DONE)) + return false; + } + return true; +} +EXPORT_SYMBOL(drm_dp_128b132b_lane_channel_eq_done); + +/* DP 2.0 errata for 128b/132b */ +bool drm_dp_128b132b_lane_symbol_locked(const u8 link_status[DP_LINK_STATUS_SIZE], + int lane_count) +{ + u8 lane_status; + int lane; + + for (lane = 0; lane < lane_count; lane++) { + lane_status = dp_get_lane_status(link_status, lane); + if (!(lane_status & DP_LANE_SYMBOL_LOCKED)) + return false; + } + return true; +} +EXPORT_SYMBOL(drm_dp_128b132b_lane_symbol_locked); + +/* DP 2.0 errata for 128b/132b */ +bool drm_dp_128b132b_eq_interlane_align_done(const u8 link_status[DP_LINK_STATUS_SIZE]) +{ + u8 status = dp_link_status(link_status, DP_LANE_ALIGN_STATUS_UPDATED); + + return status & DP_128B132B_DPRX_EQ_INTERLANE_ALIGN_DONE; +} +EXPORT_SYMBOL(drm_dp_128b132b_eq_interlane_align_done); + +/* DP 2.0 errata for 128b/132b */ +bool drm_dp_128b132b_cds_interlane_align_done(const u8 link_status[DP_LINK_STATUS_SIZE]) +{ + u8 status = dp_link_status(link_status, DP_LANE_ALIGN_STATUS_UPDATED); + + return status & DP_128B132B_DPRX_CDS_INTERLANE_ALIGN_DONE; +} +EXPORT_SYMBOL(drm_dp_128b132b_cds_interlane_align_done); + +/* DP 2.0 errata for 128b/132b */ +bool drm_dp_128b132b_link_training_failed(const u8 link_status[DP_LINK_STATUS_SIZE]) +{ + u8 status = dp_link_status(link_status, DP_LANE_ALIGN_STATUS_UPDATED); + + return status & DP_128B132B_LT_FAILED; +} +EXPORT_SYMBOL(drm_dp_128b132b_link_training_failed); + u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZE], unsigned int lane) { diff --git a/include/drm/dp/drm_dp_helper.h b/include/drm/dp/drm_dp_helper.h index aa73dfc817ff..c499d735b992 100644 --- a/include/drm/dp/drm_dp_helper.h +++ b/include/drm/dp/drm_dp_helper.h @@ -738,11 +738,13 @@ struct drm_panel; DP_LANE_CHANNEL_EQ_DONE | \ DP_LANE_SYMBOL_LOCKED)
-#define DP_LANE_ALIGN_STATUS_UPDATED 0x204 - -#define DP_INTERLANE_ALIGN_DONE (1 << 0) -#define DP_DOWNSTREAM_PORT_STATUS_CHANGED (1 << 6) -#define DP_LINK_STATUS_UPDATED (1 << 7) +#define DP_LANE_ALIGN_STATUS_UPDATED 0x204 +#define DP_INTERLANE_ALIGN_DONE (1 << 0) +#define DP_128B132B_DPRX_EQ_INTERLANE_ALIGN_DONE (1 << 2) /* 2.0 E11 */ +#define DP_128B132B_DPRX_CDS_INTERLANE_ALIGN_DONE (1 << 3) /* 2.0 E11 */ +#define DP_128B132B_LT_FAILED (1 << 4) /* 2.0 E11 */ +#define DP_DOWNSTREAM_PORT_STATUS_CHANGED (1 << 6) +#define DP_LINK_STATUS_UPDATED (1 << 7)
#define DP_SINK_STATUS 0x205 # define DP_RECEIVE_PORT_0_STATUS (1 << 0) @@ -1551,6 +1553,13 @@ void drm_dp_lttpr_link_train_channel_eq_delay(const struct drm_dp_aux *aux, const u8 caps[DP_LTTPR_PHY_CAP_SIZE]);
int drm_dp_128b132b_read_aux_rd_interval(struct drm_dp_aux *aux); +bool drm_dp_128b132b_lane_channel_eq_done(const u8 link_status[DP_LINK_STATUS_SIZE], + int lane_count); +bool drm_dp_128b132b_lane_symbol_locked(const u8 link_status[DP_LINK_STATUS_SIZE], + int lane_count); +bool drm_dp_128b132b_eq_interlane_align_done(const u8 link_status[DP_LINK_STATUS_SIZE]); +bool drm_dp_128b132b_cds_interlane_align_done(const u8 link_status[DP_LINK_STATUS_SIZE]); +bool drm_dp_128b132b_link_training_failed(const u8 link_status[DP_LINK_STATUS_SIZE]);
u8 drm_dp_link_rate_to_bw_code(int link_rate); int drm_dp_bw_code_to_link_rate(u8 link_bw);
Add some of the new additions from DP 2.0 E11.
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com --- include/drm/dp/drm_dp_helper.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/drm/dp/drm_dp_helper.h b/include/drm/dp/drm_dp_helper.h index c499d735b992..69487bd8ed56 100644 --- a/include/drm/dp/drm_dp_helper.h +++ b/include/drm/dp/drm_dp_helper.h @@ -560,6 +560,7 @@ struct drm_panel; # define DP_TRAINING_PATTERN_DISABLE 0 # define DP_TRAINING_PATTERN_1 1 # define DP_TRAINING_PATTERN_2 2 +# define DP_TRAINING_PATTERN_2_CDS 3 /* 2.0 E11 */ # define DP_TRAINING_PATTERN_3 3 /* 1.2 */ # define DP_TRAINING_PATTERN_4 7 /* 1.4 */ # define DP_TRAINING_PATTERN_MASK 0x3 @@ -1350,6 +1351,7 @@ struct drm_panel; # define DP_PHY_REPEATER_128B132B_SUPPORTED (1 << 0) /* See DP_128B132B_SUPPORTED_LINK_RATES for values */ #define DP_PHY_REPEATER_128B132B_RATES 0xf0007 /* 2.0 */ +#define DP_PHY_REPEATER_EQ_DONE 0xf0008 /* 2.0 E11 */
enum drm_dp_phy { DP_PHY_DPRX,
Call it from the higher level function, as it will be shared between two code paths.
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 9451f336f28f..4e507aa75a03 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -1083,8 +1083,6 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, bool ret = true; int i;
- intel_dp_prepare_link_train(intel_dp, crtc_state); - for (i = lttpr_count - 1; i >= 0; i--) { enum drm_dp_phy dp_phy = DP_PHY_LTTPR(i);
@@ -1127,6 +1125,8 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp, /* Still continue with enabling the port and link training. */ lttpr_count = 0;
+ intel_dp_prepare_link_train(intel_dp, crtc_state); + if (!intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count)) intel_dp_schedule_fallback_link_training(intel_dp, crtc_state); }
The DP 2.0 errata completely overhauls the 128b/132b link training, with no provisions for backward compatibility with the original DP 2.0 specification.
The changes are too intrusive to consider reusing the same code for both 8b/10b and 128b/132b, mainly because the LTTPR channel equalisation is done concurrently instead of serialized.
NOTES:
* It's a bit unclear when to wait for DP_INTERLANE_ALIGN_DONE and per-lane DP_LANE_SYMBOL_LOCKED. Figure xx4 in the SCR implies the LANEx_CHANNEL_EQ_DONE sequence may end with either 0x77,0x77,0x85 *or* 0x33,0x33,0x84 (for four lane configuration in DPCD 0x202..0x204) i.e. without the above bits set. Text elsewhere seems contradictory or incomplete.
* We read entire link status (6 bytes) everywhere instead of individual DPCD addresses.
* There are some subtle ambiguities or contradictions in the order of some DPCD access and TPS signal enables/disables. It's also not clear whether these are significant.
v2: - Always try one last time after timeouts to avoid races (Ville) - Extend timeout to cover the entire LANEx_EQ_DONE sequence (Ville) - Also check for eq interlane align done in LANEx_CDS_DONE Sequence (Ville) - Check for Intra-hop status before link training
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- .../drm/i915/display/intel_dp_link_training.c | 279 +++++++++++++++++- 1 file changed, 278 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 4e507aa75a03..cc2b82d9114c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -1102,6 +1102,277 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, return ret; }
+ +/* + * 128b/132b DP LANEx_EQ_DONE Sequence (DP 2.0 E11 3.5.2.16.1) + */ +static bool +intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state) +{ + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + u8 link_status[DP_LINK_STATUS_SIZE]; + int delay_us; + int try, max_tries = 20; + unsigned long deadline; + bool timeout = false; + + /* + * Reset signal levels. Start transmitting 128b/132b TPS1. + * + * Put DPRX and LTTPRs (if any) into intra-hop AUX mode by writing TPS1 + * in DP_TRAINING_PATTERN_SET. + */ + if (!intel_dp_reset_link_train(intel_dp, crtc_state, DP_PHY_DPRX, + DP_TRAINING_PATTERN_1)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to start 128b/132b TPS1\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux); + + /* Read the initial TX FFE settings. */ + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read TX FFE presets\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Update signal levels and training set as requested. */ + intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status); + if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to set initial TX FFE settings\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Start transmitting 128b/132b TPS2. */ + if (!intel_dp_set_link_train(intel_dp, crtc_state, DP_PHY_DPRX, + DP_TRAINING_PATTERN_2)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to start 128b/132b TPS2\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Time budget for the LANEx_EQ_DONE Sequence */ + deadline = jiffies + msecs_to_jiffies(400); + + for (try = 0; try < max_tries; try++) { + usleep_range(delay_us, 2 * delay_us); + + /* + * The delay may get updated. The transmitter shall read the + * delay before link status during link training. + */ + delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux); + + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read link status\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_link_training_failed(link_status)) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Downstream link training failure\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_lane_channel_eq_done(link_status, crtc_state->lane_count)) { + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] Lane channel eq done\n", + encoder->base.base.id, encoder->base.name); + break; + } + + if (timeout) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Lane channel eq timeout\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (time_after(jiffies, deadline)) + timeout = true; /* try one last time after deadline */ + + /* Update signal levels and training set as requested. */ + intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status); + if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to update TX FFE settings\n", + encoder->base.base.id, encoder->base.name); + return false; + } + } + + if (try == max_tries) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Max loop count reached\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + for (;;) { + if (drm_dp_128b132b_eq_interlane_align_done(link_status)) { + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] Interlane align done\n", + encoder->base.base.id, encoder->base.name); + break; + } + + if (timeout) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Interlane align timeout\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (time_after(jiffies, deadline)) + timeout = true; /* try one last time after deadline */ + + usleep_range(2000, 3000); + + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read link status\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_link_training_failed(link_status)) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Downstream link training failure\n", + encoder->base.base.id, encoder->base.name); + return false; + } + } + + return true; +} + +/* + * 128b/132b DP LANEx_CDS_DONE Sequence (DP 2.0 E11 3.5.2.16.2) + */ +static bool +intel_dp_128b132b_lane_cds(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state, + int lttpr_count) +{ + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + u8 link_status[DP_LINK_STATUS_SIZE]; + unsigned long deadline; + bool timeout = false; + + if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TRAINING_PATTERN_SET, + DP_TRAINING_PATTERN_2_CDS) != 1) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to start 128b/132b TPS2 CDS\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Time budget for the LANEx_CDS_DONE Sequence */ + deadline = jiffies + msecs_to_jiffies((lttpr_count + 1) * 20); + + for (;;) { + usleep_range(2000, 3000); + + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read link status\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_eq_interlane_align_done(link_status) && + drm_dp_128b132b_cds_interlane_align_done(link_status) && + drm_dp_128b132b_lane_symbol_locked(link_status, crtc_state->lane_count)) { + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] CDS interlane align done\n", + encoder->base.base.id, encoder->base.name); + break; + } + + if (drm_dp_128b132b_link_training_failed(link_status)) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Downstream link training failure\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (timeout) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] CDS timeout\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (time_after(jiffies, deadline)) + timeout = true; /* try one last time after deadline */ + } + + /* FIXME: Should DP_TRAINING_PATTERN_DISABLE be written first? */ + if (intel_dp->set_idle_link_train) + intel_dp->set_idle_link_train(intel_dp, crtc_state); + + return true; +} + +/* + * 128b/132b link training sequence. (DP 2.0 E11 SCR on link training.) + */ +static bool +intel_dp_128b132b_link_train(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state, + int lttpr_count) +{ + struct drm_i915_private *i915 = dp_to_i915(intel_dp); + struct intel_connector *connector = intel_dp->attached_connector; + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + bool passed = false; + u8 sink_status; + + /* FIXME: We should possibly do this earlier. */ + if (drm_dp_dpcd_readb(&intel_dp->aux, DP_SINK_STATUS, &sink_status) != 1) { + drm_dbg_kms(&i915->drm, "Failed to read sink status\n"); + return false; + } + + if (sink_status & DP_INTRA_HOP_AUX_REPLY_INDICATION) { + drm_dbg_kms(&i915->drm, "Previous link training in progress\n"); + return false; + } + + if (intel_dp_128b132b_lane_eq(intel_dp, crtc_state) && + intel_dp_128b132b_lane_cds(intel_dp, crtc_state, lttpr_count)) + passed = true; + + drm_dbg_kms(&i915->drm, + "[CONNECTOR:%d:%s][ENCODER:%d:%s] 128b/132b Link Training %s at link rate = %d, lane count = %d\n", + connector->base.base.id, connector->base.name, + encoder->base.base.id, encoder->base.name, + passed ? "passed" : "failed", + crtc_state->port_clock, crtc_state->lane_count); + + return passed; +} + /** * intel_dp_start_link_train - start link training * @intel_dp: DP struct @@ -1115,6 +1386,7 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, void intel_dp_start_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state) { + static bool passed; /* * TODO: Reiniting LTTPRs here won't be needed once proper connector * HW state readout is added. @@ -1127,6 +1399,11 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp,
intel_dp_prepare_link_train(intel_dp, crtc_state);
- if (!intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count)) + if (intel_dp_is_uhbr(crtc_state)) + passed = intel_dp_128b132b_link_train(intel_dp, crtc_state, lttpr_count); + else + passed = intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count); + + if (!passed) intel_dp_schedule_fallback_link_training(intel_dp, crtc_state); }
On Thu, Feb 03, 2022 at 11:03:54AM +0200, Jani Nikula wrote:
The DP 2.0 errata completely overhauls the 128b/132b link training, with no provisions for backward compatibility with the original DP 2.0 specification.
The changes are too intrusive to consider reusing the same code for both 8b/10b and 128b/132b, mainly because the LTTPR channel equalisation is done concurrently instead of serialized.
NOTES:
It's a bit unclear when to wait for DP_INTERLANE_ALIGN_DONE and per-lane DP_LANE_SYMBOL_LOCKED. Figure xx4 in the SCR implies the LANEx_CHANNEL_EQ_DONE sequence may end with either 0x77,0x77,0x85 *or* 0x33,0x33,0x84 (for four lane configuration in DPCD 0x202..0x204) i.e. without the above bits set. Text elsewhere seems contradictory or incomplete.
We read entire link status (6 bytes) everywhere instead of individual DPCD addresses.
There are some subtle ambiguities or contradictions in the order of some DPCD access and TPS signal enables/disables. It's also not clear whether these are significant.
v2:
- Always try one last time after timeouts to avoid races (Ville)
- Extend timeout to cover the entire LANEx_EQ_DONE sequence (Ville)
- Also check for eq interlane align done in LANEx_CDS_DONE Sequence (Ville)
- Check for Intra-hop status before link training
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com
.../drm/i915/display/intel_dp_link_training.c | 279 +++++++++++++++++- 1 file changed, 278 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 4e507aa75a03..cc2b82d9114c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -1102,6 +1102,277 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, return ret; }
+/*
- 128b/132b DP LANEx_EQ_DONE Sequence (DP 2.0 E11 3.5.2.16.1)
- */
+static bool +intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state)+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- u8 link_status[DP_LINK_STATUS_SIZE];
- int delay_us;
- int try, max_tries = 20;
- unsigned long deadline;
- bool timeout = false;
- /*
* Reset signal levels. Start transmitting 128b/132b TPS1.** Put DPRX and LTTPRs (if any) into intra-hop AUX mode by writing TPS1* in DP_TRAINING_PATTERN_SET.*/- if (!intel_dp_reset_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
DP_TRAINING_PATTERN_1)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS1\n",encoder->base.base.id, encoder->base.name);return false;- }
- delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux);
- /* Read the initial TX FFE settings. */
- if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {
drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read TX FFE presets\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Update signal levels and training set as requested. */
- intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status);
- if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) {
drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to set initial TX FFE settings\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Start transmitting 128b/132b TPS2. */
- if (!intel_dp_set_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
DP_TRAINING_PATTERN_2)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS2\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Time budget for the LANEx_EQ_DONE Sequence */
- deadline = jiffies + msecs_to_jiffies(400);
Didn't we have a msecs_to_jiffies_timeout() that adds an extra jiffy to make sure we don't bail too early?
- for (try = 0; try < max_tries; try++) {
usleep_range(delay_us, 2 * delay_us);/** The delay may get updated. The transmitter shall read the* delay before link status during link training.*/delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_lane_channel_eq_done(link_status, crtc_state->lane_count)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] Lane channel eq done\n",encoder->base.base.id, encoder->base.name);break;}
The state diagrame has thow two steps in reverse order. I suppose it doens't matter but probably better if we don't deviate too much without a good reason.
if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Lane channel eq timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */
Is there a reason we can't do this just before drm_dp_dpcd_read_link_status() so we don't have to pass the timeout status from one loop iteration to the next?
/* Update signal levels and training set as requested. */intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status);if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to update TX FFE settings\n",encoder->base.base.id, encoder->base.name);return false;}- }
- if (try == max_tries) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Max loop count reached\n",encoder->base.base.id, encoder->base.name);return false;- }
- for (;;) {
if (drm_dp_128b132b_eq_interlane_align_done(link_status)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] Interlane align done\n",encoder->base.base.id, encoder->base.name);break;}
Not a big fan of pasing the link_status between loops. Can't we just read the status here at the start of the loop always?
if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Interlane align timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */usleep_range(2000, 3000);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}- }
- return true;
+}
+/*
- 128b/132b DP LANEx_CDS_DONE Sequence (DP 2.0 E11 3.5.2.16.2)
- */
+static bool +intel_dp_128b132b_lane_cds(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state,int lttpr_count)+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- u8 link_status[DP_LINK_STATUS_SIZE];
- unsigned long deadline;
- bool timeout = false;
- if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TRAINING_PATTERN_SET,
DP_TRAINING_PATTERN_2_CDS) != 1) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS2 CDS\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Time budget for the LANEx_CDS_DONE Sequence */
- deadline = jiffies + msecs_to_jiffies((lttpr_count + 1) * 20);
- for (;;) {
usleep_range(2000, 3000);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_eq_interlane_align_done(link_status) &&drm_dp_128b132b_cds_interlane_align_done(link_status) &&drm_dp_128b132b_lane_symbol_locked(link_status, crtc_state->lane_count)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] CDS interlane align done\n",encoder->base.base.id, encoder->base.name);break;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] CDS timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */- }
- /* FIXME: Should DP_TRAINING_PATTERN_DISABLE be written first? */
- if (intel_dp->set_idle_link_train)
intel_dp->set_idle_link_train(intel_dp, crtc_state);- return true;
+}
+/*
- 128b/132b link training sequence. (DP 2.0 E11 SCR on link training.)
- */
+static bool +intel_dp_128b132b_link_train(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state,int lttpr_count)+{
- struct drm_i915_private *i915 = dp_to_i915(intel_dp);
- struct intel_connector *connector = intel_dp->attached_connector;
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- bool passed = false;
- u8 sink_status;
- /* FIXME: We should possibly do this earlier. */
- if (drm_dp_dpcd_readb(&intel_dp->aux, DP_SINK_STATUS, &sink_status) != 1) {
drm_dbg_kms(&i915->drm, "Failed to read sink status\n");return false;- }
- if (sink_status & DP_INTRA_HOP_AUX_REPLY_INDICATION) {
drm_dbg_kms(&i915->drm, "Previous link training in progress\n");return false;- }
- if (intel_dp_128b132b_lane_eq(intel_dp, crtc_state) &&
intel_dp_128b132b_lane_cds(intel_dp, crtc_state, lttpr_count))passed = true;
I think we are supposed to wait for the intra-hop AUX bit to go low here.
- drm_dbg_kms(&i915->drm,
"[CONNECTOR:%d:%s][ENCODER:%d:%s] 128b/132b Link Training %s at link rate = %d, lane count = %d\n",connector->base.base.id, connector->base.name,encoder->base.base.id, encoder->base.name,passed ? "passed" : "failed",crtc_state->port_clock, crtc_state->lane_count);- return passed;
+}
/**
- intel_dp_start_link_train - start link training
- @intel_dp: DP struct
@@ -1115,6 +1386,7 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, void intel_dp_start_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state) {
- static bool passed; /*
- TODO: Reiniting LTTPRs here won't be needed once proper connector
- HW state readout is added.
@@ -1127,6 +1399,11 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp,
intel_dp_prepare_link_train(intel_dp, crtc_state);
- if (!intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count))
- if (intel_dp_is_uhbr(crtc_state))
passed = intel_dp_128b132b_link_train(intel_dp, crtc_state, lttpr_count);- else
passed = intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count);- if (!passed) intel_dp_schedule_fallback_link_training(intel_dp, crtc_state);
}
2.30.2
On Fri, 04 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Thu, Feb 03, 2022 at 11:03:54AM +0200, Jani Nikula wrote:
The DP 2.0 errata completely overhauls the 128b/132b link training, with no provisions for backward compatibility with the original DP 2.0 specification.
The changes are too intrusive to consider reusing the same code for both 8b/10b and 128b/132b, mainly because the LTTPR channel equalisation is done concurrently instead of serialized.
NOTES:
It's a bit unclear when to wait for DP_INTERLANE_ALIGN_DONE and per-lane DP_LANE_SYMBOL_LOCKED. Figure xx4 in the SCR implies the LANEx_CHANNEL_EQ_DONE sequence may end with either 0x77,0x77,0x85 *or* 0x33,0x33,0x84 (for four lane configuration in DPCD 0x202..0x204) i.e. without the above bits set. Text elsewhere seems contradictory or incomplete.
We read entire link status (6 bytes) everywhere instead of individual DPCD addresses.
There are some subtle ambiguities or contradictions in the order of some DPCD access and TPS signal enables/disables. It's also not clear whether these are significant.
v2:
- Always try one last time after timeouts to avoid races (Ville)
- Extend timeout to cover the entire LANEx_EQ_DONE sequence (Ville)
- Also check for eq interlane align done in LANEx_CDS_DONE Sequence (Ville)
- Check for Intra-hop status before link training
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com
.../drm/i915/display/intel_dp_link_training.c | 279 +++++++++++++++++- 1 file changed, 278 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 4e507aa75a03..cc2b82d9114c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -1102,6 +1102,277 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, return ret; }
+/*
- 128b/132b DP LANEx_EQ_DONE Sequence (DP 2.0 E11 3.5.2.16.1)
- */
+static bool +intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state)+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- u8 link_status[DP_LINK_STATUS_SIZE];
- int delay_us;
- int try, max_tries = 20;
- unsigned long deadline;
- bool timeout = false;
- /*
* Reset signal levels. Start transmitting 128b/132b TPS1.** Put DPRX and LTTPRs (if any) into intra-hop AUX mode by writing TPS1* in DP_TRAINING_PATTERN_SET.*/- if (!intel_dp_reset_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
DP_TRAINING_PATTERN_1)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS1\n",encoder->base.base.id, encoder->base.name);return false;- }
- delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux);
- /* Read the initial TX FFE settings. */
- if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {
drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read TX FFE presets\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Update signal levels and training set as requested. */
- intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status);
- if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) {
drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to set initial TX FFE settings\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Start transmitting 128b/132b TPS2. */
- if (!intel_dp_set_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
DP_TRAINING_PATTERN_2)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS2\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Time budget for the LANEx_EQ_DONE Sequence */
- deadline = jiffies + msecs_to_jiffies(400);
Didn't we have a msecs_to_jiffies_timeout() that adds an extra jiffy to make sure we don't bail too early?
Hrmh, still local in i915_utils.h after all these years.
- for (try = 0; try < max_tries; try++) {
usleep_range(delay_us, 2 * delay_us);/** The delay may get updated. The transmitter shall read the* delay before link status during link training.*/delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_lane_channel_eq_done(link_status, crtc_state->lane_count)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] Lane channel eq done\n",encoder->base.base.id, encoder->base.name);break;}The state diagrame has thow two steps in reverse order. I suppose it doens't matter but probably better if we don't deviate too much without a good reason.
I thought the fail bit should probably have priority. What if you have both eq done *and* lt failed set, for whatever reason?
if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Lane channel eq timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */Is there a reason we can't do this just before drm_dp_dpcd_read_link_status() so we don't have to pass the timeout status from one loop iteration to the next?
The point is to check one last time after timeout has passed, like you suggested in previous review, and I agreed.
/* Update signal levels and training set as requested. */intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status);if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to update TX FFE settings\n",encoder->base.base.id, encoder->base.name);return false;}- }
- if (try == max_tries) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Max loop count reached\n",encoder->base.base.id, encoder->base.name);return false;- }
- for (;;) {
if (drm_dp_128b132b_eq_interlane_align_done(link_status)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] Interlane align done\n",encoder->base.base.id, encoder->base.name);break;}Not a big fan of pasing the link_status between loops. Can't we just read the status here at the start of the loop always?
I guess. It can lead to an extra read if interlane align gets done already in the previous loop.
Combined with the timeout flag from the previous loop, the implementation proposed here passes CDS if the last attempt after timeout has passed has interlane align done, but does not read anything more here.
if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Interlane align timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */usleep_range(2000, 3000);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}- }
- return true;
+}
+/*
- 128b/132b DP LANEx_CDS_DONE Sequence (DP 2.0 E11 3.5.2.16.2)
- */
+static bool +intel_dp_128b132b_lane_cds(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state,int lttpr_count)+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- u8 link_status[DP_LINK_STATUS_SIZE];
- unsigned long deadline;
- bool timeout = false;
- if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TRAINING_PATTERN_SET,
DP_TRAINING_PATTERN_2_CDS) != 1) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS2 CDS\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Time budget for the LANEx_CDS_DONE Sequence */
- deadline = jiffies + msecs_to_jiffies((lttpr_count + 1) * 20);
- for (;;) {
usleep_range(2000, 3000);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_eq_interlane_align_done(link_status) &&drm_dp_128b132b_cds_interlane_align_done(link_status) &&drm_dp_128b132b_lane_symbol_locked(link_status, crtc_state->lane_count)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] CDS interlane align done\n",encoder->base.base.id, encoder->base.name);break;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] CDS timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */- }
- /* FIXME: Should DP_TRAINING_PATTERN_DISABLE be written first? */
- if (intel_dp->set_idle_link_train)
intel_dp->set_idle_link_train(intel_dp, crtc_state);- return true;
+}
+/*
- 128b/132b link training sequence. (DP 2.0 E11 SCR on link training.)
- */
+static bool +intel_dp_128b132b_link_train(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state,int lttpr_count)+{
- struct drm_i915_private *i915 = dp_to_i915(intel_dp);
- struct intel_connector *connector = intel_dp->attached_connector;
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- bool passed = false;
- u8 sink_status;
- /* FIXME: We should possibly do this earlier. */
- if (drm_dp_dpcd_readb(&intel_dp->aux, DP_SINK_STATUS, &sink_status) != 1) {
drm_dbg_kms(&i915->drm, "Failed to read sink status\n");return false;- }
- if (sink_status & DP_INTRA_HOP_AUX_REPLY_INDICATION) {
drm_dbg_kms(&i915->drm, "Previous link training in progress\n");return false;- }
- if (intel_dp_128b132b_lane_eq(intel_dp, crtc_state) &&
intel_dp_128b132b_lane_cds(intel_dp, crtc_state, lttpr_count))passed = true;I think we are supposed to wait for the intra-hop AUX bit to go low here.
Where's that said in the spec? I thought we're supposed to wait *before* starting link training.
Also, I think the bit might only go low after we've stopped link training, i.e. once the higher level calls intel_dp_stop_link_train() which sets DP_TRAINING_PATTERN_DISABLE. So the wait, if any, would need to be in that function.
- drm_dbg_kms(&i915->drm,
"[CONNECTOR:%d:%s][ENCODER:%d:%s] 128b/132b Link Training %s at link rate = %d, lane count = %d\n",connector->base.base.id, connector->base.name,encoder->base.base.id, encoder->base.name,passed ? "passed" : "failed",crtc_state->port_clock, crtc_state->lane_count);- return passed;
+}
/**
- intel_dp_start_link_train - start link training
- @intel_dp: DP struct
@@ -1115,6 +1386,7 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, void intel_dp_start_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state) {
- static bool passed; /*
- TODO: Reiniting LTTPRs here won't be needed once proper connector
- HW state readout is added.
@@ -1127,6 +1399,11 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp,
intel_dp_prepare_link_train(intel_dp, crtc_state);
- if (!intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count))
- if (intel_dp_is_uhbr(crtc_state))
passed = intel_dp_128b132b_link_train(intel_dp, crtc_state, lttpr_count);- else
passed = intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count);- if (!passed) intel_dp_schedule_fallback_link_training(intel_dp, crtc_state);
}
2.30.2
On Tue, Feb 08, 2022 at 11:17:22AM +0200, Jani Nikula wrote:
On Fri, 04 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Thu, Feb 03, 2022 at 11:03:54AM +0200, Jani Nikula wrote:
The DP 2.0 errata completely overhauls the 128b/132b link training, with no provisions for backward compatibility with the original DP 2.0 specification.
The changes are too intrusive to consider reusing the same code for both 8b/10b and 128b/132b, mainly because the LTTPR channel equalisation is done concurrently instead of serialized.
NOTES:
It's a bit unclear when to wait for DP_INTERLANE_ALIGN_DONE and per-lane DP_LANE_SYMBOL_LOCKED. Figure xx4 in the SCR implies the LANEx_CHANNEL_EQ_DONE sequence may end with either 0x77,0x77,0x85 *or* 0x33,0x33,0x84 (for four lane configuration in DPCD 0x202..0x204) i.e. without the above bits set. Text elsewhere seems contradictory or incomplete.
We read entire link status (6 bytes) everywhere instead of individual DPCD addresses.
There are some subtle ambiguities or contradictions in the order of some DPCD access and TPS signal enables/disables. It's also not clear whether these are significant.
v2:
- Always try one last time after timeouts to avoid races (Ville)
- Extend timeout to cover the entire LANEx_EQ_DONE sequence (Ville)
- Also check for eq interlane align done in LANEx_CDS_DONE Sequence (Ville)
- Check for Intra-hop status before link training
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com
.../drm/i915/display/intel_dp_link_training.c | 279 +++++++++++++++++- 1 file changed, 278 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 4e507aa75a03..cc2b82d9114c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -1102,6 +1102,277 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, return ret; }
+/*
- 128b/132b DP LANEx_EQ_DONE Sequence (DP 2.0 E11 3.5.2.16.1)
- */
+static bool +intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state)+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- u8 link_status[DP_LINK_STATUS_SIZE];
- int delay_us;
- int try, max_tries = 20;
- unsigned long deadline;
- bool timeout = false;
- /*
* Reset signal levels. Start transmitting 128b/132b TPS1.** Put DPRX and LTTPRs (if any) into intra-hop AUX mode by writing TPS1* in DP_TRAINING_PATTERN_SET.*/- if (!intel_dp_reset_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
DP_TRAINING_PATTERN_1)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS1\n",encoder->base.base.id, encoder->base.name);return false;- }
- delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux);
- /* Read the initial TX FFE settings. */
- if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {
drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read TX FFE presets\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Update signal levels and training set as requested. */
- intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status);
- if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) {
drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to set initial TX FFE settings\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Start transmitting 128b/132b TPS2. */
- if (!intel_dp_set_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
DP_TRAINING_PATTERN_2)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS2\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Time budget for the LANEx_EQ_DONE Sequence */
- deadline = jiffies + msecs_to_jiffies(400);
Didn't we have a msecs_to_jiffies_timeout() that adds an extra jiffy to make sure we don't bail too early?
Hrmh, still local in i915_utils.h after all these years.
- for (try = 0; try < max_tries; try++) {
usleep_range(delay_us, 2 * delay_us);/** The delay may get updated. The transmitter shall read the* delay before link status during link training.*/delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_lane_channel_eq_done(link_status, crtc_state->lane_count)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] Lane channel eq done\n",encoder->base.base.id, encoder->base.name);break;}The state diagrame has thow two steps in reverse order. I suppose it doens't matter but probably better if we don't deviate too much without a good reason.
I thought the fail bit should probably have priority. What if you have both eq done *and* lt failed set, for whatever reason?
Yeah, I guess from that angle it might make sense to check the fail bit first. Unless there's some crazy device out there that succeeds in link training but accidentally sets the fail bit anyway.
if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Lane channel eq timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */Is there a reason we can't do this just before drm_dp_dpcd_read_link_status() so we don't have to pass the timeout status from one loop iteration to the next?
The point is to check one last time after timeout has passed, like you suggested in previous review, and I agreed.
Sure but why can't it be something more like?
timeout = time_after(); read_status(); if (bad) bail; if (timeout) bail;
I think we have it more like that in wait_for()/etc.
/* Update signal levels and training set as requested. */intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status);if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to update TX FFE settings\n",encoder->base.base.id, encoder->base.name);return false;}- }
- if (try == max_tries) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Max loop count reached\n",encoder->base.base.id, encoder->base.name);return false;- }
- for (;;) {
if (drm_dp_128b132b_eq_interlane_align_done(link_status)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] Interlane align done\n",encoder->base.base.id, encoder->base.name);break;}Not a big fan of pasing the link_status between loops. Can't we just read the status here at the start of the loop always?
I guess. It can lead to an extra read if interlane align gets done already in the previous loop.
Combined with the timeout flag from the previous loop, the implementation proposed here passes CDS if the last attempt after timeout has passed has interlane align done, but does not read anything more here.
I don't think optimizing away one dpcd read should be very important here. Less stuff to think about if we don't have to pass data from one loop to the next IMO. If nothing gets passed then nothing can be stale/etc.
if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Interlane align timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */usleep_range(2000, 3000);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}- }
- return true;
+}
+/*
- 128b/132b DP LANEx_CDS_DONE Sequence (DP 2.0 E11 3.5.2.16.2)
- */
+static bool +intel_dp_128b132b_lane_cds(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state,int lttpr_count)+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- u8 link_status[DP_LINK_STATUS_SIZE];
- unsigned long deadline;
- bool timeout = false;
- if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TRAINING_PATTERN_SET,
DP_TRAINING_PATTERN_2_CDS) != 1) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS2 CDS\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Time budget for the LANEx_CDS_DONE Sequence */
- deadline = jiffies + msecs_to_jiffies((lttpr_count + 1) * 20);
- for (;;) {
usleep_range(2000, 3000);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_eq_interlane_align_done(link_status) &&drm_dp_128b132b_cds_interlane_align_done(link_status) &&drm_dp_128b132b_lane_symbol_locked(link_status, crtc_state->lane_count)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] CDS interlane align done\n",encoder->base.base.id, encoder->base.name);break;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] CDS timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */- }
- /* FIXME: Should DP_TRAINING_PATTERN_DISABLE be written first? */
- if (intel_dp->set_idle_link_train)
intel_dp->set_idle_link_train(intel_dp, crtc_state);- return true;
+}
+/*
- 128b/132b link training sequence. (DP 2.0 E11 SCR on link training.)
- */
+static bool +intel_dp_128b132b_link_train(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state,int lttpr_count)+{
- struct drm_i915_private *i915 = dp_to_i915(intel_dp);
- struct intel_connector *connector = intel_dp->attached_connector;
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- bool passed = false;
- u8 sink_status;
- /* FIXME: We should possibly do this earlier. */
- if (drm_dp_dpcd_readb(&intel_dp->aux, DP_SINK_STATUS, &sink_status) != 1) {
drm_dbg_kms(&i915->drm, "Failed to read sink status\n");return false;- }
- if (sink_status & DP_INTRA_HOP_AUX_REPLY_INDICATION) {
drm_dbg_kms(&i915->drm, "Previous link training in progress\n");return false;- }
- if (intel_dp_128b132b_lane_eq(intel_dp, crtc_state) &&
intel_dp_128b132b_lane_cds(intel_dp, crtc_state, lttpr_count))passed = true;I think we are supposed to wait for the intra-hop AUX bit to go low here.
Where's that said in the spec? I thought we're supposed to wait *before* starting link training.
I think it was mentioned there somewhere. Also we have to wait before we can allow normal AUX activity anyway (assuming we had that part hookd up).
Also, I think the bit might only go low after we've stopped link training, i.e. once the higher level calls intel_dp_stop_link_train() which sets DP_TRAINING_PATTERN_DISABLE. So the wait, if any, would need to be in that function.
Yeah that might be right spot.
On Tue, 08 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Tue, Feb 08, 2022 at 11:17:22AM +0200, Jani Nikula wrote:
On Fri, 04 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Thu, Feb 03, 2022 at 11:03:54AM +0200, Jani Nikula wrote:
if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Lane channel eq timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */Is there a reason we can't do this just before drm_dp_dpcd_read_link_status() so we don't have to pass the timeout status from one loop iteration to the next?
The point is to check one last time after timeout has passed, like you suggested in previous review, and I agreed.
Sure but why can't it be something more like?
timeout = time_after(); read_status(); if (bad) bail; if (timeout) bail;
I think we have it more like that in wait_for()/etc.
I was going to fix this, but then realized the "one more time" really only makes sense if it includes updating the signal levels and training set and then checking the status. I don't think there's point in "one more time" only covering the status read.
I've got the loop set up such that the flow is natural when entering the loop i.e. I'd rather not have the adjust in the beginning with some if (try != 0) check.
Or am I missing something?
BR, Jani.
On Tue, Feb 08, 2022 at 02:12:33PM +0200, Jani Nikula wrote:
On Tue, 08 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Tue, Feb 08, 2022 at 11:17:22AM +0200, Jani Nikula wrote:
On Fri, 04 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Thu, Feb 03, 2022 at 11:03:54AM +0200, Jani Nikula wrote:
if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Lane channel eq timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */Is there a reason we can't do this just before drm_dp_dpcd_read_link_status() so we don't have to pass the timeout status from one loop iteration to the next?
The point is to check one last time after timeout has passed, like you suggested in previous review, and I agreed.
Sure but why can't it be something more like?
timeout = time_after(); read_status(); if (bad) bail; if (timeout) bail;
I think we have it more like that in wait_for()/etc.
I was going to fix this, but then realized the "one more time" really only makes sense if it includes updating the signal levels and training set and then checking the status. I don't think there's point in "one more time" only covering the status read.
Hmm. Yeah, I suppose that is true. We can't really know when the sink updated the status so checking for the timeout just before that might have the same issue as checking entirely after the status check.
I've got the loop set up such that the flow is natural when entering the loop i.e. I'd rather not have the adjust in the beginning with some if (try != 0) check.
Or am I missing something?
Nah. I guess it's best leave it the way you have it now.
On Tue, 08 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Tue, Feb 08, 2022 at 02:12:33PM +0200, Jani Nikula wrote:
On Tue, 08 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Tue, Feb 08, 2022 at 11:17:22AM +0200, Jani Nikula wrote:
On Fri, 04 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Thu, Feb 03, 2022 at 11:03:54AM +0200, Jani Nikula wrote:
if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Lane channel eq timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */Is there a reason we can't do this just before drm_dp_dpcd_read_link_status() so we don't have to pass the timeout status from one loop iteration to the next?
The point is to check one last time after timeout has passed, like you suggested in previous review, and I agreed.
Sure but why can't it be something more like?
timeout = time_after(); read_status(); if (bad) bail; if (timeout) bail;
I think we have it more like that in wait_for()/etc.
I was going to fix this, but then realized the "one more time" really only makes sense if it includes updating the signal levels and training set and then checking the status. I don't think there's point in "one more time" only covering the status read.
Hmm. Yeah, I suppose that is true. We can't really know when the sink updated the status so checking for the timeout just before that might have the same issue as checking entirely after the status check.
I've got the loop set up such that the flow is natural when entering the loop i.e. I'd rather not have the adjust in the beginning with some if (try != 0) check.
Or am I missing something?
Nah. I guess it's best leave it the way you have it now.
Thanks. Sent v3, but realized I'm still missing the intra-hop stuff.
The DP 2.0 errata completely overhauls the 128b/132b link training, with no provisions for backward compatibility with the original DP 2.0 specification.
The changes are too intrusive to consider reusing the same code for both 8b/10b and 128b/132b, mainly because the LTTPR channel equalisation is done concurrently instead of serialized.
NOTES:
* It's a bit unclear when to wait for DP_INTERLANE_ALIGN_DONE and per-lane DP_LANE_SYMBOL_LOCKED. Figure xx4 in the SCR implies the LANEx_CHANNEL_EQ_DONE sequence may end with either 0x77,0x77,0x85 *or* 0x33,0x33,0x84 (for four lane configuration in DPCD 0x202..0x204) i.e. without the above bits set. Text elsewhere seems contradictory or incomplete.
* We read entire link status (6 bytes) everywhere instead of individual DPCD addresses.
* There are some subtle ambiguities or contradictions in the order of some DPCD access and TPS signal enables/disables. It's also not clear whether these are significant.
v3: - Use msecs_to_jiffies_timeout() (Ville) - Read status at the beginning of interlane align done loop (Ville) - Try to simplify timeout flag use where possible (Ville)
v2: - Always try one last time after timeouts to avoid races (Ville) - Extend timeout to cover the entire LANEx_EQ_DONE sequence (Ville) - Also check for eq interlane align done in LANEx_CDS_DONE Sequence (Ville) - Check for Intra-hop status before link training
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- .../drm/i915/display/intel_dp_link_training.c | 281 +++++++++++++++++- 1 file changed, 280 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 4e507aa75a03..17aa5d712389 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -1102,6 +1102,279 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, return ret; }
+ +/* + * 128b/132b DP LANEx_EQ_DONE Sequence (DP 2.0 E11 3.5.2.16.1) + */ +static bool +intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state) +{ + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + u8 link_status[DP_LINK_STATUS_SIZE]; + int delay_us; + int try, max_tries = 20; + unsigned long deadline; + bool timeout = false; + + /* + * Reset signal levels. Start transmitting 128b/132b TPS1. + * + * Put DPRX and LTTPRs (if any) into intra-hop AUX mode by writing TPS1 + * in DP_TRAINING_PATTERN_SET. + */ + if (!intel_dp_reset_link_train(intel_dp, crtc_state, DP_PHY_DPRX, + DP_TRAINING_PATTERN_1)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to start 128b/132b TPS1\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux); + + /* Read the initial TX FFE settings. */ + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read TX FFE presets\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Update signal levels and training set as requested. */ + intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status); + if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to set initial TX FFE settings\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Start transmitting 128b/132b TPS2. */ + if (!intel_dp_set_link_train(intel_dp, crtc_state, DP_PHY_DPRX, + DP_TRAINING_PATTERN_2)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to start 128b/132b TPS2\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Time budget for the LANEx_EQ_DONE Sequence */ + deadline = jiffies + msecs_to_jiffies_timeout(400); + + for (try = 0; try < max_tries; try++) { + usleep_range(delay_us, 2 * delay_us); + + /* + * The delay may get updated. The transmitter shall read the + * delay before link status during link training. + */ + delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux); + + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read link status\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_link_training_failed(link_status)) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Downstream link training failure\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_lane_channel_eq_done(link_status, crtc_state->lane_count)) { + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] Lane channel eq done\n", + encoder->base.base.id, encoder->base.name); + break; + } + + if (timeout) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Lane channel eq timeout\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (time_after(jiffies, deadline)) + timeout = true; /* try one last time after deadline */ + + /* Update signal levels and training set as requested. */ + intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status); + if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to update TX FFE settings\n", + encoder->base.base.id, encoder->base.name); + return false; + } + } + + if (try == max_tries) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Max loop count reached\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + for (;;) { + if (time_after(jiffies, deadline)) + timeout = true; /* try one last time after deadline */ + + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read link status\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_link_training_failed(link_status)) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Downstream link training failure\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_eq_interlane_align_done(link_status)) { + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] Interlane align done\n", + encoder->base.base.id, encoder->base.name); + break; + } + + if (timeout) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Interlane align timeout\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + usleep_range(2000, 3000); + } + + return true; +} + +/* + * 128b/132b DP LANEx_CDS_DONE Sequence (DP 2.0 E11 3.5.2.16.2) + */ +static bool +intel_dp_128b132b_lane_cds(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state, + int lttpr_count) +{ + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + u8 link_status[DP_LINK_STATUS_SIZE]; + unsigned long deadline; + + if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TRAINING_PATTERN_SET, + DP_TRAINING_PATTERN_2_CDS) != 1) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to start 128b/132b TPS2 CDS\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Time budget for the LANEx_CDS_DONE Sequence */ + deadline = jiffies + msecs_to_jiffies_timeout((lttpr_count + 1) * 20); + + for (;;) { + bool timeout = false; + + if (time_after(jiffies, deadline)) + timeout = true; /* try one last time after deadline */ + + usleep_range(2000, 3000); + + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read link status\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_eq_interlane_align_done(link_status) && + drm_dp_128b132b_cds_interlane_align_done(link_status) && + drm_dp_128b132b_lane_symbol_locked(link_status, crtc_state->lane_count)) { + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] CDS interlane align done\n", + encoder->base.base.id, encoder->base.name); + break; + } + + if (drm_dp_128b132b_link_training_failed(link_status)) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Downstream link training failure\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (timeout) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] CDS timeout\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + } + + /* FIXME: Should DP_TRAINING_PATTERN_DISABLE be written first? */ + if (intel_dp->set_idle_link_train) + intel_dp->set_idle_link_train(intel_dp, crtc_state); + + return true; +} + +/* + * 128b/132b link training sequence. (DP 2.0 E11 SCR on link training.) + */ +static bool +intel_dp_128b132b_link_train(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state, + int lttpr_count) +{ + struct drm_i915_private *i915 = dp_to_i915(intel_dp); + struct intel_connector *connector = intel_dp->attached_connector; + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + bool passed = false; + u8 sink_status; + + /* FIXME: We should possibly do this earlier. */ + if (drm_dp_dpcd_readb(&intel_dp->aux, DP_SINK_STATUS, &sink_status) != 1) { + drm_dbg_kms(&i915->drm, "Failed to read sink status\n"); + return false; + } + + if (sink_status & DP_INTRA_HOP_AUX_REPLY_INDICATION) { + drm_dbg_kms(&i915->drm, "Previous link training in progress\n"); + return false; + } + + if (intel_dp_128b132b_lane_eq(intel_dp, crtc_state) && + intel_dp_128b132b_lane_cds(intel_dp, crtc_state, lttpr_count)) + passed = true; + + drm_dbg_kms(&i915->drm, + "[CONNECTOR:%d:%s][ENCODER:%d:%s] 128b/132b Link Training %s at link rate = %d, lane count = %d\n", + connector->base.base.id, connector->base.name, + encoder->base.base.id, encoder->base.name, + passed ? "passed" : "failed", + crtc_state->port_clock, crtc_state->lane_count); + + return passed; +} + /** * intel_dp_start_link_train - start link training * @intel_dp: DP struct @@ -1115,6 +1388,7 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, void intel_dp_start_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state) { + static bool passed; /* * TODO: Reiniting LTTPRs here won't be needed once proper connector * HW state readout is added. @@ -1127,6 +1401,11 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp,
intel_dp_prepare_link_train(intel_dp, crtc_state);
- if (!intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count)) + if (intel_dp_is_uhbr(crtc_state)) + passed = intel_dp_128b132b_link_train(intel_dp, crtc_state, lttpr_count); + else + passed = intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count); + + if (!passed) intel_dp_schedule_fallback_link_training(intel_dp, crtc_state); }
The DP 2.0 errata completely overhauls the 128b/132b link training, with no provisions for backward compatibility with the original DP 2.0 specification.
The changes are too intrusive to consider reusing the same code for both 8b/10b and 128b/132b, mainly because the LTTPR channel equalisation is done concurrently instead of serialized.
NOTES:
* It's a bit unclear when to wait for DP_INTERLANE_ALIGN_DONE and per-lane DP_LANE_SYMBOL_LOCKED. Figure xx4 in the SCR implies the LANEx_CHANNEL_EQ_DONE sequence may end with either 0x77,0x77,0x85 *or* 0x33,0x33,0x84 (for four lane configuration in DPCD 0x202..0x204) i.e. without the above bits set. Text elsewhere seems contradictory or incomplete.
* We read entire link status (6 bytes) everywhere instead of individual DPCD addresses.
* There are some subtle ambiguities or contradictions in the order of some DPCD access and TPS signal enables/disables. It's also not clear whether these are significant.
v4: - Wait for intra-hop clear after link training end (Ville) - Wait instead of single check for intra-hop clear before link train
v3: - Use msecs_to_jiffies_timeout() (Ville) - Read status at the beginning of interlane align done loop (Ville) - Try to simplify timeout flag use where possible (Ville)
v2: - Always try one last time after timeouts to avoid races (Ville) - Extend timeout to cover the entire LANEx_EQ_DONE sequence (Ville) - Also check for eq interlane align done in LANEx_CDS_DONE Sequence (Ville) - Check for Intra-hop status before link training
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- .../drm/i915/display/intel_dp_link_training.c | 303 +++++++++++++++++- 1 file changed, 302 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 4e507aa75a03..d7f6d92ac5b5 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -996,6 +996,23 @@ static bool intel_dp_disable_dpcd_training_pattern(struct intel_dp *intel_dp, return drm_dp_dpcd_write(&intel_dp->aux, reg, &val, 1) == 1; }
+static int +intel_dp_128b132b_intra_hop(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state) +{ + struct drm_i915_private *i915 = dp_to_i915(intel_dp); + u8 sink_status; + int ret; + + ret = drm_dp_dpcd_readb(&intel_dp->aux, DP_SINK_STATUS, &sink_status); + if (ret != 1) { + drm_dbg_kms(&i915->drm, "Failed to read sink status\n"); + return ret < 0 ? ret : -EIO; + } + + return sink_status & DP_INTRA_HOP_AUX_REPLY_INDICATION ? 1 : 0; +} + /** * intel_dp_stop_link_train - stop link training * @intel_dp: DP struct @@ -1015,11 +1032,21 @@ static bool intel_dp_disable_dpcd_training_pattern(struct intel_dp *intel_dp, void intel_dp_stop_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp); + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + intel_dp->link_trained = true;
intel_dp_disable_dpcd_training_pattern(intel_dp, DP_PHY_DPRX); intel_dp_program_link_training_pattern(intel_dp, crtc_state, DP_PHY_DPRX, DP_TRAINING_PATTERN_DISABLE); + + if (intel_dp_is_uhbr(crtc_state) && + wait_for(intel_dp_128b132b_intra_hop(intel_dp, crtc_state) == 0, 500)) { + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] 128b/132b intra-hop not clearing\n", + encoder->base.base.id, encoder->base.name); + } }
static bool @@ -1102,6 +1129,274 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, return ret; }
+ +/* + * 128b/132b DP LANEx_EQ_DONE Sequence (DP 2.0 E11 3.5.2.16.1) + */ +static bool +intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state) +{ + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + u8 link_status[DP_LINK_STATUS_SIZE]; + int delay_us; + int try, max_tries = 20; + unsigned long deadline; + bool timeout = false; + + /* + * Reset signal levels. Start transmitting 128b/132b TPS1. + * + * Put DPRX and LTTPRs (if any) into intra-hop AUX mode by writing TPS1 + * in DP_TRAINING_PATTERN_SET. + */ + if (!intel_dp_reset_link_train(intel_dp, crtc_state, DP_PHY_DPRX, + DP_TRAINING_PATTERN_1)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to start 128b/132b TPS1\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux); + + /* Read the initial TX FFE settings. */ + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read TX FFE presets\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Update signal levels and training set as requested. */ + intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status); + if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to set initial TX FFE settings\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Start transmitting 128b/132b TPS2. */ + if (!intel_dp_set_link_train(intel_dp, crtc_state, DP_PHY_DPRX, + DP_TRAINING_PATTERN_2)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to start 128b/132b TPS2\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Time budget for the LANEx_EQ_DONE Sequence */ + deadline = jiffies + msecs_to_jiffies_timeout(400); + + for (try = 0; try < max_tries; try++) { + usleep_range(delay_us, 2 * delay_us); + + /* + * The delay may get updated. The transmitter shall read the + * delay before link status during link training. + */ + delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux); + + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read link status\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_link_training_failed(link_status)) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Downstream link training failure\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_lane_channel_eq_done(link_status, crtc_state->lane_count)) { + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] Lane channel eq done\n", + encoder->base.base.id, encoder->base.name); + break; + } + + if (timeout) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Lane channel eq timeout\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (time_after(jiffies, deadline)) + timeout = true; /* try one last time after deadline */ + + /* Update signal levels and training set as requested. */ + intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status); + if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to update TX FFE settings\n", + encoder->base.base.id, encoder->base.name); + return false; + } + } + + if (try == max_tries) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Max loop count reached\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + for (;;) { + if (time_after(jiffies, deadline)) + timeout = true; /* try one last time after deadline */ + + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read link status\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_link_training_failed(link_status)) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Downstream link training failure\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_eq_interlane_align_done(link_status)) { + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] Interlane align done\n", + encoder->base.base.id, encoder->base.name); + break; + } + + if (timeout) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Interlane align timeout\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + usleep_range(2000, 3000); + } + + return true; +} + +/* + * 128b/132b DP LANEx_CDS_DONE Sequence (DP 2.0 E11 3.5.2.16.2) + */ +static bool +intel_dp_128b132b_lane_cds(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state, + int lttpr_count) +{ + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + u8 link_status[DP_LINK_STATUS_SIZE]; + unsigned long deadline; + + if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TRAINING_PATTERN_SET, + DP_TRAINING_PATTERN_2_CDS) != 1) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to start 128b/132b TPS2 CDS\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + /* Time budget for the LANEx_CDS_DONE Sequence */ + deadline = jiffies + msecs_to_jiffies_timeout((lttpr_count + 1) * 20); + + for (;;) { + bool timeout = false; + + if (time_after(jiffies, deadline)) + timeout = true; /* try one last time after deadline */ + + usleep_range(2000, 3000); + + if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] Failed to read link status\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (drm_dp_128b132b_eq_interlane_align_done(link_status) && + drm_dp_128b132b_cds_interlane_align_done(link_status) && + drm_dp_128b132b_lane_symbol_locked(link_status, crtc_state->lane_count)) { + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] CDS interlane align done\n", + encoder->base.base.id, encoder->base.name); + break; + } + + if (drm_dp_128b132b_link_training_failed(link_status)) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] Downstream link training failure\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (timeout) { + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_err(&i915->drm, + "[ENCODER:%d:%s] CDS timeout\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + } + + /* FIXME: Should DP_TRAINING_PATTERN_DISABLE be written first? */ + if (intel_dp->set_idle_link_train) + intel_dp->set_idle_link_train(intel_dp, crtc_state); + + return true; +} + +/* + * 128b/132b link training sequence. (DP 2.0 E11 SCR on link training.) + */ +static bool +intel_dp_128b132b_link_train(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state, + int lttpr_count) +{ + struct drm_i915_private *i915 = dp_to_i915(intel_dp); + struct intel_connector *connector = intel_dp->attached_connector; + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + bool passed = false; + + if (wait_for(intel_dp_128b132b_intra_hop(intel_dp, crtc_state) == 0, 500)) { + drm_err(&i915->drm, + "[ENCODER:%d:%s] 128b/132b intra-hop not clear\n", + encoder->base.base.id, encoder->base.name); + return false; + } + + if (intel_dp_128b132b_lane_eq(intel_dp, crtc_state) && + intel_dp_128b132b_lane_cds(intel_dp, crtc_state, lttpr_count)) + passed = true; + + drm_dbg_kms(&i915->drm, + "[CONNECTOR:%d:%s][ENCODER:%d:%s] 128b/132b Link Training %s at link rate = %d, lane count = %d\n", + connector->base.base.id, connector->base.name, + encoder->base.base.id, encoder->base.name, + passed ? "passed" : "failed", + crtc_state->port_clock, crtc_state->lane_count); + + return passed; +} + /** * intel_dp_start_link_train - start link training * @intel_dp: DP struct @@ -1115,6 +1410,7 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, void intel_dp_start_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state) { + static bool passed; /* * TODO: Reiniting LTTPRs here won't be needed once proper connector * HW state readout is added. @@ -1127,6 +1423,11 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp,
intel_dp_prepare_link_train(intel_dp, crtc_state);
- if (!intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count)) + if (intel_dp_is_uhbr(crtc_state)) + passed = intel_dp_128b132b_link_train(intel_dp, crtc_state, lttpr_count); + else + passed = intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count); + + if (!passed) intel_dp_schedule_fallback_link_training(intel_dp, crtc_state); }
On Tue, Feb 08, 2022 at 04:32:09PM +0200, Jani Nikula wrote:
The DP 2.0 errata completely overhauls the 128b/132b link training, with no provisions for backward compatibility with the original DP 2.0 specification.
The changes are too intrusive to consider reusing the same code for both 8b/10b and 128b/132b, mainly because the LTTPR channel equalisation is done concurrently instead of serialized.
NOTES:
It's a bit unclear when to wait for DP_INTERLANE_ALIGN_DONE and per-lane DP_LANE_SYMBOL_LOCKED. Figure xx4 in the SCR implies the LANEx_CHANNEL_EQ_DONE sequence may end with either 0x77,0x77,0x85 *or* 0x33,0x33,0x84 (for four lane configuration in DPCD 0x202..0x204) i.e. without the above bits set. Text elsewhere seems contradictory or incomplete.
We read entire link status (6 bytes) everywhere instead of individual DPCD addresses.
There are some subtle ambiguities or contradictions in the order of some DPCD access and TPS signal enables/disables. It's also not clear whether these are significant.
v4:
- Wait for intra-hop clear after link training end (Ville)
- Wait instead of single check for intra-hop clear before link train
v3:
- Use msecs_to_jiffies_timeout() (Ville)
- Read status at the beginning of interlane align done loop (Ville)
- Try to simplify timeout flag use where possible (Ville)
v2:
- Always try one last time after timeouts to avoid races (Ville)
- Extend timeout to cover the entire LANEx_EQ_DONE sequence (Ville)
- Also check for eq interlane align done in LANEx_CDS_DONE Sequence (Ville)
- Check for Intra-hop status before link training
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com
Looks good to me. Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com
.../drm/i915/display/intel_dp_link_training.c | 303 +++++++++++++++++- 1 file changed, 302 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 4e507aa75a03..d7f6d92ac5b5 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -996,6 +996,23 @@ static bool intel_dp_disable_dpcd_training_pattern(struct intel_dp *intel_dp, return drm_dp_dpcd_write(&intel_dp->aux, reg, &val, 1) == 1; }
+static int +intel_dp_128b132b_intra_hop(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state)+{
- struct drm_i915_private *i915 = dp_to_i915(intel_dp);
- u8 sink_status;
- int ret;
- ret = drm_dp_dpcd_readb(&intel_dp->aux, DP_SINK_STATUS, &sink_status);
- if (ret != 1) {
drm_dbg_kms(&i915->drm, "Failed to read sink status\n");return ret < 0 ? ret : -EIO;- }
- return sink_status & DP_INTRA_HOP_AUX_REPLY_INDICATION ? 1 : 0;
+}
/**
- intel_dp_stop_link_train - stop link training
- @intel_dp: DP struct
@@ -1015,11 +1032,21 @@ static bool intel_dp_disable_dpcd_training_pattern(struct intel_dp *intel_dp, void intel_dp_stop_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state) {
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
intel_dp->link_trained = true;
intel_dp_disable_dpcd_training_pattern(intel_dp, DP_PHY_DPRX); intel_dp_program_link_training_pattern(intel_dp, crtc_state, DP_PHY_DPRX, DP_TRAINING_PATTERN_DISABLE);
if (intel_dp_is_uhbr(crtc_state) &&
wait_for(intel_dp_128b132b_intra_hop(intel_dp, crtc_state) == 0, 500)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] 128b/132b intra-hop not clearing\n",encoder->base.base.id, encoder->base.name);}
}
static bool @@ -1102,6 +1129,274 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, return ret; }
+/*
- 128b/132b DP LANEx_EQ_DONE Sequence (DP 2.0 E11 3.5.2.16.1)
- */
+static bool +intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state)+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- u8 link_status[DP_LINK_STATUS_SIZE];
- int delay_us;
- int try, max_tries = 20;
- unsigned long deadline;
- bool timeout = false;
- /*
* Reset signal levels. Start transmitting 128b/132b TPS1.** Put DPRX and LTTPRs (if any) into intra-hop AUX mode by writing TPS1* in DP_TRAINING_PATTERN_SET.*/- if (!intel_dp_reset_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
DP_TRAINING_PATTERN_1)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS1\n",encoder->base.base.id, encoder->base.name);return false;- }
- delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux);
- /* Read the initial TX FFE settings. */
- if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {
drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read TX FFE presets\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Update signal levels and training set as requested. */
- intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status);
- if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) {
drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to set initial TX FFE settings\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Start transmitting 128b/132b TPS2. */
- if (!intel_dp_set_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
DP_TRAINING_PATTERN_2)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS2\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Time budget for the LANEx_EQ_DONE Sequence */
- deadline = jiffies + msecs_to_jiffies_timeout(400);
- for (try = 0; try < max_tries; try++) {
usleep_range(delay_us, 2 * delay_us);/** The delay may get updated. The transmitter shall read the* delay before link status during link training.*/delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_lane_channel_eq_done(link_status, crtc_state->lane_count)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] Lane channel eq done\n",encoder->base.base.id, encoder->base.name);break;}if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Lane channel eq timeout\n",encoder->base.base.id, encoder->base.name);return false;}if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline *//* Update signal levels and training set as requested. */intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status);if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to update TX FFE settings\n",encoder->base.base.id, encoder->base.name);return false;}- }
- if (try == max_tries) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Max loop count reached\n",encoder->base.base.id, encoder->base.name);return false;- }
- for (;;) {
if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_eq_interlane_align_done(link_status)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] Interlane align done\n",encoder->base.base.id, encoder->base.name);break;}if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Interlane align timeout\n",encoder->base.base.id, encoder->base.name);return false;}usleep_range(2000, 3000);- }
- return true;
+}
+/*
- 128b/132b DP LANEx_CDS_DONE Sequence (DP 2.0 E11 3.5.2.16.2)
- */
+static bool +intel_dp_128b132b_lane_cds(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state,int lttpr_count)+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- u8 link_status[DP_LINK_STATUS_SIZE];
- unsigned long deadline;
- if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TRAINING_PATTERN_SET,
DP_TRAINING_PATTERN_2_CDS) != 1) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to start 128b/132b TPS2 CDS\n",encoder->base.base.id, encoder->base.name);return false;- }
- /* Time budget for the LANEx_CDS_DONE Sequence */
- deadline = jiffies + msecs_to_jiffies_timeout((lttpr_count + 1) * 20);
- for (;;) {
bool timeout = false;if (time_after(jiffies, deadline))timeout = true; /* try one last time after deadline */usleep_range(2000, 3000);if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {drm_err(&i915->drm,"[ENCODER:%d:%s] Failed to read link status\n",encoder->base.base.id, encoder->base.name);return false;}if (drm_dp_128b132b_eq_interlane_align_done(link_status) &&drm_dp_128b132b_cds_interlane_align_done(link_status) &&drm_dp_128b132b_lane_symbol_locked(link_status, crtc_state->lane_count)) {drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] CDS interlane align done\n",encoder->base.base.id, encoder->base.name);break;}if (drm_dp_128b132b_link_training_failed(link_status)) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] Downstream link training failure\n",encoder->base.base.id, encoder->base.name);return false;}if (timeout) {intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);drm_err(&i915->drm,"[ENCODER:%d:%s] CDS timeout\n",encoder->base.base.id, encoder->base.name);return false;}- }
- /* FIXME: Should DP_TRAINING_PATTERN_DISABLE be written first? */
- if (intel_dp->set_idle_link_train)
intel_dp->set_idle_link_train(intel_dp, crtc_state);- return true;
+}
+/*
- 128b/132b link training sequence. (DP 2.0 E11 SCR on link training.)
- */
+static bool +intel_dp_128b132b_link_train(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state,int lttpr_count)+{
- struct drm_i915_private *i915 = dp_to_i915(intel_dp);
- struct intel_connector *connector = intel_dp->attached_connector;
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- bool passed = false;
- if (wait_for(intel_dp_128b132b_intra_hop(intel_dp, crtc_state) == 0, 500)) {
drm_err(&i915->drm,"[ENCODER:%d:%s] 128b/132b intra-hop not clear\n",encoder->base.base.id, encoder->base.name);return false;- }
- if (intel_dp_128b132b_lane_eq(intel_dp, crtc_state) &&
intel_dp_128b132b_lane_cds(intel_dp, crtc_state, lttpr_count))passed = true;- drm_dbg_kms(&i915->drm,
"[CONNECTOR:%d:%s][ENCODER:%d:%s] 128b/132b Link Training %s at link rate = %d, lane count = %d\n",connector->base.base.id, connector->base.name,encoder->base.base.id, encoder->base.name,passed ? "passed" : "failed",crtc_state->port_clock, crtc_state->lane_count);- return passed;
+}
/**
- intel_dp_start_link_train - start link training
- @intel_dp: DP struct
@@ -1115,6 +1410,7 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, void intel_dp_start_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state) {
- static bool passed; /*
- TODO: Reiniting LTTPRs here won't be needed once proper connector
- HW state readout is added.
@@ -1127,6 +1423,11 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp,
intel_dp_prepare_link_train(intel_dp, crtc_state);
- if (!intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count))
- if (intel_dp_is_uhbr(crtc_state))
passed = intel_dp_128b132b_link_train(intel_dp, crtc_state, lttpr_count);- else
passed = intel_dp_link_train_all_phys(intel_dp, crtc_state, lttpr_count);- if (!passed) intel_dp_schedule_fallback_link_training(intel_dp, crtc_state);
}
2.30.2
Abstract link status check to a function that takes 128b/132b and 8b/10b into account, and use it. Also dump link status on failures.
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- drivers/gpu/drm/i915/display/intel_dp.c | 39 ++++++++++++++----- .../drm/i915/display/intel_dp_link_training.c | 2 +- .../drm/i915/display/intel_dp_link_training.h | 4 ++ 3 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 146b83916005..8c5590f0409a 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3628,6 +3628,32 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) "Could not write test response to sink\n"); }
+static bool intel_dp_link_ok(struct intel_dp *intel_dp, + u8 link_status[DP_LINK_STATUS_SIZE]) +{ + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + bool uhbr = intel_dp->link_rate >= 1000000; + bool ok; + + if (uhbr) + ok = drm_dp_128b132b_lane_channel_eq_done(link_status, + intel_dp->lane_count); + else + ok = drm_dp_channel_eq_ok(link_status, intel_dp->lane_count); + + if (ok) + return true; + + intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); + drm_dbg_kms(&i915->drm, + "[ENCODER:%d:%s] %s link not ok, retraining\n", + encoder->base.base.id, encoder->base.name, + uhbr ? "128b/132b" : "8b/10b"); + + return false; +} + static void intel_dp_mst_hpd_irq(struct intel_dp *intel_dp, u8 *esi, u8 *ack) { @@ -3658,14 +3684,7 @@ static bool intel_dp_mst_link_status(struct intel_dp *intel_dp) return false; }
- if (!drm_dp_channel_eq_ok(link_status, intel_dp->lane_count)) { - drm_dbg_kms(&i915->drm, - "[ENCODER:%d:%s] channel EQ not ok, retraining\n", - encoder->base.base.id, encoder->base.name); - return false; - } - - return true; + return intel_dp_link_ok(intel_dp, link_status); }
/** @@ -3779,8 +3798,8 @@ intel_dp_needs_link_retrain(struct intel_dp *intel_dp) intel_dp->lane_count)) return false;
- /* Retrain if Channel EQ or CR not ok */ - return !drm_dp_channel_eq_ok(link_status, intel_dp->lane_count); + /* Retrain if link not ok */ + return !intel_dp_link_ok(intel_dp, link_status); }
static bool intel_dp_has_connector(struct intel_dp *intel_dp, diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index cc2b82d9114c..0686da36c428 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -712,7 +712,7 @@ static bool intel_dp_adjust_request_changed(const struct intel_crtc_state *crtc_ return false; }
-static void +void intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy, const u8 link_status[DP_LINK_STATUS_SIZE]) { diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.h b/drivers/gpu/drm/i915/display/intel_dp_link_training.h index dbfb15705aaa..dc1556b46b85 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.h +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.h @@ -29,6 +29,10 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp, void intel_dp_stop_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state);
+void +intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy, + const u8 link_status[DP_LINK_STATUS_SIZE]); + /* Get the TPSx symbol type of the value programmed to DP_TRAINING_PATTERN_SET */ static inline u8 intel_dp_training_pattern_symbol(u8 pattern) {
On Thu, Feb 03, 2022 at 11:03:55AM +0200, Jani Nikula wrote:
Abstract link status check to a function that takes 128b/132b and 8b/10b into account, and use it. Also dump link status on failures.
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_dp.c | 39 ++++++++++++++----- .../drm/i915/display/intel_dp_link_training.c | 2 +- .../drm/i915/display/intel_dp_link_training.h | 4 ++ 3 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 146b83916005..8c5590f0409a 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3628,6 +3628,32 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) "Could not write test response to sink\n"); }
+static bool intel_dp_link_ok(struct intel_dp *intel_dp,
u8 link_status[DP_LINK_STATUS_SIZE])+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- bool uhbr = intel_dp->link_rate >= 1000000;
- bool ok;
- if (uhbr)
ok = drm_dp_128b132b_lane_channel_eq_done(link_status,intel_dp->lane_count);
I was pondering whether we need to check more of the bits here. I guess time will tell.
Remainder of the series is Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com
- else
ok = drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);- if (ok)
return true;- intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
- drm_dbg_kms(&i915->drm,
"[ENCODER:%d:%s] %s link not ok, retraining\n",encoder->base.base.id, encoder->base.name,uhbr ? "128b/132b" : "8b/10b");- return false;
+}
static void intel_dp_mst_hpd_irq(struct intel_dp *intel_dp, u8 *esi, u8 *ack) { @@ -3658,14 +3684,7 @@ static bool intel_dp_mst_link_status(struct intel_dp *intel_dp) return false; }
- if (!drm_dp_channel_eq_ok(link_status, intel_dp->lane_count)) {
drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] channel EQ not ok, retraining\n",encoder->base.base.id, encoder->base.name);return false;- }
- return true;
- return intel_dp_link_ok(intel_dp, link_status);
}
/** @@ -3779,8 +3798,8 @@ intel_dp_needs_link_retrain(struct intel_dp *intel_dp) intel_dp->lane_count)) return false;
- /* Retrain if Channel EQ or CR not ok */
- return !drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);
- /* Retrain if link not ok */
- return !intel_dp_link_ok(intel_dp, link_status);
}
static bool intel_dp_has_connector(struct intel_dp *intel_dp, diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index cc2b82d9114c..0686da36c428 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -712,7 +712,7 @@ static bool intel_dp_adjust_request_changed(const struct intel_crtc_state *crtc_ return false; }
-static void +void intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy, const u8 link_status[DP_LINK_STATUS_SIZE]) { diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.h b/drivers/gpu/drm/i915/display/intel_dp_link_training.h index dbfb15705aaa..dc1556b46b85 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.h +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.h @@ -29,6 +29,10 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp, void intel_dp_stop_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state);
+void +intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy,
const u8 link_status[DP_LINK_STATUS_SIZE]);/* Get the TPSx symbol type of the value programmed to DP_TRAINING_PATTERN_SET */ static inline u8 intel_dp_training_pattern_symbol(u8 pattern) { -- 2.30.2
On Tue, 08 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Thu, Feb 03, 2022 at 11:03:55AM +0200, Jani Nikula wrote:
Abstract link status check to a function that takes 128b/132b and 8b/10b into account, and use it. Also dump link status on failures.
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_dp.c | 39 ++++++++++++++----- .../drm/i915/display/intel_dp_link_training.c | 2 +- .../drm/i915/display/intel_dp_link_training.h | 4 ++ 3 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 146b83916005..8c5590f0409a 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3628,6 +3628,32 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) "Could not write test response to sink\n"); }
+static bool intel_dp_link_ok(struct intel_dp *intel_dp,
u8 link_status[DP_LINK_STATUS_SIZE])+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- bool uhbr = intel_dp->link_rate >= 1000000;
- bool ok;
- if (uhbr)
ok = drm_dp_128b132b_lane_channel_eq_done(link_status,intel_dp->lane_count);I was pondering whether we need to check more of the bits here. I guess time will tell.
Remainder of the series is Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com
Just to be on the safe side, does this cover patches 2 and 4 too?
And thanks for all the reviews so far, much appreciated!
BR, Jani.
- else
ok = drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);- if (ok)
return true;- intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
- drm_dbg_kms(&i915->drm,
"[ENCODER:%d:%s] %s link not ok, retraining\n",encoder->base.base.id, encoder->base.name,uhbr ? "128b/132b" : "8b/10b");- return false;
+}
static void intel_dp_mst_hpd_irq(struct intel_dp *intel_dp, u8 *esi, u8 *ack) { @@ -3658,14 +3684,7 @@ static bool intel_dp_mst_link_status(struct intel_dp *intel_dp) return false; }
- if (!drm_dp_channel_eq_ok(link_status, intel_dp->lane_count)) {
drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] channel EQ not ok, retraining\n",encoder->base.base.id, encoder->base.name);return false;- }
- return true;
- return intel_dp_link_ok(intel_dp, link_status);
}
/** @@ -3779,8 +3798,8 @@ intel_dp_needs_link_retrain(struct intel_dp *intel_dp) intel_dp->lane_count)) return false;
- /* Retrain if Channel EQ or CR not ok */
- return !drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);
- /* Retrain if link not ok */
- return !intel_dp_link_ok(intel_dp, link_status);
}
static bool intel_dp_has_connector(struct intel_dp *intel_dp, diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index cc2b82d9114c..0686da36c428 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -712,7 +712,7 @@ static bool intel_dp_adjust_request_changed(const struct intel_crtc_state *crtc_ return false; }
-static void +void intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy, const u8 link_status[DP_LINK_STATUS_SIZE]) { diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.h b/drivers/gpu/drm/i915/display/intel_dp_link_training.h index dbfb15705aaa..dc1556b46b85 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.h +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.h @@ -29,6 +29,10 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp, void intel_dp_stop_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state);
+void +intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy,
const u8 link_status[DP_LINK_STATUS_SIZE]);/* Get the TPSx symbol type of the value programmed to DP_TRAINING_PATTERN_SET */ static inline u8 intel_dp_training_pattern_symbol(u8 pattern) { -- 2.30.2
On Wed, Feb 09, 2022 at 11:09:41AM +0200, Jani Nikula wrote:
On Tue, 08 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Thu, Feb 03, 2022 at 11:03:55AM +0200, Jani Nikula wrote:
Abstract link status check to a function that takes 128b/132b and 8b/10b into account, and use it. Also dump link status on failures.
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_dp.c | 39 ++++++++++++++----- .../drm/i915/display/intel_dp_link_training.c | 2 +- .../drm/i915/display/intel_dp_link_training.h | 4 ++ 3 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 146b83916005..8c5590f0409a 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3628,6 +3628,32 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) "Could not write test response to sink\n"); }
+static bool intel_dp_link_ok(struct intel_dp *intel_dp,
u8 link_status[DP_LINK_STATUS_SIZE])+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- bool uhbr = intel_dp->link_rate >= 1000000;
- bool ok;
- if (uhbr)
ok = drm_dp_128b132b_lane_channel_eq_done(link_status,intel_dp->lane_count);I was pondering whether we need to check more of the bits here. I guess time will tell.
Remainder of the series is Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com
Just to be on the safe side, does this cover patches 2 and 4 too?
Yeah, pretty sure I read through all of them.
And thanks for all the reviews so far, much appreciated!
BR, Jani.
- else
ok = drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);- if (ok)
return true;- intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
- drm_dbg_kms(&i915->drm,
"[ENCODER:%d:%s] %s link not ok, retraining\n",encoder->base.base.id, encoder->base.name,uhbr ? "128b/132b" : "8b/10b");- return false;
+}
static void intel_dp_mst_hpd_irq(struct intel_dp *intel_dp, u8 *esi, u8 *ack) { @@ -3658,14 +3684,7 @@ static bool intel_dp_mst_link_status(struct intel_dp *intel_dp) return false; }
- if (!drm_dp_channel_eq_ok(link_status, intel_dp->lane_count)) {
drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] channel EQ not ok, retraining\n",encoder->base.base.id, encoder->base.name);return false;- }
- return true;
- return intel_dp_link_ok(intel_dp, link_status);
}
/** @@ -3779,8 +3798,8 @@ intel_dp_needs_link_retrain(struct intel_dp *intel_dp) intel_dp->lane_count)) return false;
- /* Retrain if Channel EQ or CR not ok */
- return !drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);
- /* Retrain if link not ok */
- return !intel_dp_link_ok(intel_dp, link_status);
}
static bool intel_dp_has_connector(struct intel_dp *intel_dp, diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index cc2b82d9114c..0686da36c428 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -712,7 +712,7 @@ static bool intel_dp_adjust_request_changed(const struct intel_crtc_state *crtc_ return false; }
-static void +void intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy, const u8 link_status[DP_LINK_STATUS_SIZE]) { diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.h b/drivers/gpu/drm/i915/display/intel_dp_link_training.h index dbfb15705aaa..dc1556b46b85 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.h +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.h @@ -29,6 +29,10 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp, void intel_dp_stop_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state);
+void +intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy,
const u8 link_status[DP_LINK_STATUS_SIZE]);/* Get the TPSx symbol type of the value programmed to DP_TRAINING_PATTERN_SET */ static inline u8 intel_dp_training_pattern_symbol(u8 pattern) { -- 2.30.2
-- Jani Nikula, Intel Open Source Graphics Center
On Wed, 09 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Wed, Feb 09, 2022 at 11:09:41AM +0200, Jani Nikula wrote:
On Tue, 08 Feb 2022, Ville Syrjälä ville.syrjala@linux.intel.com wrote:
On Thu, Feb 03, 2022 at 11:03:55AM +0200, Jani Nikula wrote:
Abstract link status check to a function that takes 128b/132b and 8b/10b into account, and use it. Also dump link status on failures.
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_dp.c | 39 ++++++++++++++----- .../drm/i915/display/intel_dp_link_training.c | 2 +- .../drm/i915/display/intel_dp_link_training.h | 4 ++ 3 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 146b83916005..8c5590f0409a 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3628,6 +3628,32 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) "Could not write test response to sink\n"); }
+static bool intel_dp_link_ok(struct intel_dp *intel_dp,
u8 link_status[DP_LINK_STATUS_SIZE])+{
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- bool uhbr = intel_dp->link_rate >= 1000000;
- bool ok;
- if (uhbr)
ok = drm_dp_128b132b_lane_channel_eq_done(link_status,intel_dp->lane_count);I was pondering whether we need to check more of the bits here. I guess time will tell.
Remainder of the series is Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com
Just to be on the safe side, does this cover patches 2 and 4 too?
Yeah, pretty sure I read through all of them.
Thanks, pushed to drm-intel-next, patches 1-3 with Thomas' irc ack.
BR, Jani.
And thanks for all the reviews so far, much appreciated!
BR, Jani.
- else
ok = drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);- if (ok)
return true;- intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
- drm_dbg_kms(&i915->drm,
"[ENCODER:%d:%s] %s link not ok, retraining\n",encoder->base.base.id, encoder->base.name,uhbr ? "128b/132b" : "8b/10b");- return false;
+}
static void intel_dp_mst_hpd_irq(struct intel_dp *intel_dp, u8 *esi, u8 *ack) { @@ -3658,14 +3684,7 @@ static bool intel_dp_mst_link_status(struct intel_dp *intel_dp) return false; }
- if (!drm_dp_channel_eq_ok(link_status, intel_dp->lane_count)) {
drm_dbg_kms(&i915->drm,"[ENCODER:%d:%s] channel EQ not ok, retraining\n",encoder->base.base.id, encoder->base.name);return false;- }
- return true;
- return intel_dp_link_ok(intel_dp, link_status);
}
/** @@ -3779,8 +3798,8 @@ intel_dp_needs_link_retrain(struct intel_dp *intel_dp) intel_dp->lane_count)) return false;
- /* Retrain if Channel EQ or CR not ok */
- return !drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);
- /* Retrain if link not ok */
- return !intel_dp_link_ok(intel_dp, link_status);
}
static bool intel_dp_has_connector(struct intel_dp *intel_dp, diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index cc2b82d9114c..0686da36c428 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -712,7 +712,7 @@ static bool intel_dp_adjust_request_changed(const struct intel_crtc_state *crtc_ return false; }
-static void +void intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy, const u8 link_status[DP_LINK_STATUS_SIZE]) { diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.h b/drivers/gpu/drm/i915/display/intel_dp_link_training.h index dbfb15705aaa..dc1556b46b85 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.h +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.h @@ -29,6 +29,10 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp, void intel_dp_stop_link_train(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state);
+void +intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy,
const u8 link_status[DP_LINK_STATUS_SIZE]);/* Get the TPSx symbol type of the value programmed to DP_TRAINING_PATTERN_SET */ static inline u8 intel_dp_training_pattern_symbol(u8 pattern) { -- 2.30.2
-- Jani Nikula, Intel Open Source Graphics Center
128b/132b supports using 64 slots starting from 0, while 8b/10b reserves slot 0 for metadata.
Commit d6c6a76f80a1 ("drm: Update MST First Link Slot Information Based on Encoding Format") added support for updating the topology state accordingly, and commit 41724ea273cd ("drm/amd/display: Add DP 2.0 MST DM Support") started using it in the amd driver.
This feels more than a little cumbersome, especially updating the information in atomic check. For i915, add the update to MST connector .compute_config hook rather than iterating over all MST managers and connectors in global mode config .atomic_check. Fingers crossed.
v2: - Update in .compute_config() not .atomic_check (Ville)
Cc: Bhawanpreet Lakha Bhawanpreet.Lakha@amd.com Cc: Lyude Paul lyude@redhat.com Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- drivers/gpu/drm/i915/display/intel_dp_mst.c | 29 +++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 6b6eab507d30..2959e2c3930b 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -99,6 +99,27 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, return 0; }
+static void intel_dp_mst_update_slots(struct intel_encoder *encoder, + struct intel_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder); + struct intel_dp *intel_dp = &intel_mst->primary->dp; + struct drm_dp_mst_topology_mgr *mgr = &intel_dp->mst_mgr; + struct drm_dp_mst_topology_state *topology_state; + u8 link_coding_cap = intel_dp_is_uhbr(crtc_state) ? + DP_CAP_ANSI_128B132B : DP_CAP_ANSI_8B10B; + + topology_state = drm_atomic_get_mst_topology_state(conn_state->state, mgr); + if (IS_ERR(topology_state)) { + drm_dbg_kms(&i915->drm, "slot update failed\n"); + return; + } + + drm_dp_mst_update_slots(topology_state, link_coding_cap); +} + static int intel_dp_mst_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) @@ -155,6 +176,8 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, if (ret) return ret;
+ intel_dp_mst_update_slots(encoder, pipe_config, conn_state); + pipe_config->limited_color_range = intel_dp_limited_color_range(pipe_config, conn_state);
@@ -357,6 +380,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state, struct intel_connector *connector = to_intel_connector(old_conn_state->connector); struct drm_i915_private *i915 = to_i915(connector->base.dev); + int start_slot = intel_dp_is_uhbr(old_crtc_state) ? 0 : 1; int ret;
drm_dbg_kms(&i915->drm, "active links %d\n", @@ -366,7 +390,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, connector->port);
- ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, 1); + ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, start_slot); if (ret) { drm_dbg_kms(&i915->drm, "failed to update payload %d\n", ret); } @@ -475,6 +499,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct intel_connector *connector = to_intel_connector(conn_state->connector); + int start_slot = intel_dp_is_uhbr(pipe_config) ? 0 : 1; int ret; bool first_mst_stream;
@@ -509,7 +534,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state,
intel_dp->active_mst_links++;
- ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, 1); + ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, start_slot);
/* * Before Gen 12 this is not done as part of
On Thu, Feb 03, 2022 at 11:03:56AM +0200, Jani Nikula wrote:
128b/132b supports using 64 slots starting from 0, while 8b/10b reserves slot 0 for metadata.
Commit d6c6a76f80a1 ("drm: Update MST First Link Slot Information Based on Encoding Format") added support for updating the topology state accordingly, and commit 41724ea273cd ("drm/amd/display: Add DP 2.0 MST DM Support") started using it in the amd driver.
This feels more than a little cumbersome, especially updating the information in atomic check. For i915, add the update to MST connector .compute_config hook rather than iterating over all MST managers and connectors in global mode config .atomic_check. Fingers crossed.
v2:
- Update in .compute_config() not .atomic_check (Ville)
Cc: Bhawanpreet Lakha Bhawanpreet.Lakha@amd.com Cc: Lyude Paul lyude@redhat.com Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_dp_mst.c | 29 +++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 6b6eab507d30..2959e2c3930b 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -99,6 +99,27 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, return 0; }
+static void intel_dp_mst_update_slots(struct intel_encoder *encoder,
struct intel_crtc_state *crtc_state,struct drm_connector_state *conn_state)+{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
- struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder);
- struct intel_dp *intel_dp = &intel_mst->primary->dp;
- struct drm_dp_mst_topology_mgr *mgr = &intel_dp->mst_mgr;
- struct drm_dp_mst_topology_state *topology_state;
- u8 link_coding_cap = intel_dp_is_uhbr(crtc_state) ?
DP_CAP_ANSI_128B132B : DP_CAP_ANSI_8B10B;- topology_state = drm_atomic_get_mst_topology_state(conn_state->state, mgr);
- if (IS_ERR(topology_state)) {
drm_dbg_kms(&i915->drm, "slot update failed\n");return;
We need to propagate the error upwards. Other than that seems about as as reasonable as it can be given the current state of things.
So with that fixed Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com
- }
- drm_dp_mst_update_slots(topology_state, link_coding_cap);
+}
static int intel_dp_mst_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) @@ -155,6 +176,8 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, if (ret) return ret;
- intel_dp_mst_update_slots(encoder, pipe_config, conn_state);
- pipe_config->limited_color_range = intel_dp_limited_color_range(pipe_config, conn_state);
@@ -357,6 +380,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state, struct intel_connector *connector = to_intel_connector(old_conn_state->connector); struct drm_i915_private *i915 = to_i915(connector->base.dev);
int start_slot = intel_dp_is_uhbr(old_crtc_state) ? 0 : 1; int ret;
drm_dbg_kms(&i915->drm, "active links %d\n",
@@ -366,7 +390,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, connector->port);
- ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, 1);
- ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, start_slot); if (ret) { drm_dbg_kms(&i915->drm, "failed to update payload %d\n", ret); }
@@ -475,6 +499,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct intel_connector *connector = to_intel_connector(conn_state->connector);
- int start_slot = intel_dp_is_uhbr(pipe_config) ? 0 : 1; int ret; bool first_mst_stream;
@@ -509,7 +534,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state,
intel_dp->active_mst_links++;
- ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, 1);
ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, start_slot);
/*
- Before Gen 12 this is not done as part of
-- 2.30.2
128b/132b supports using 64 slots starting from 0, while 8b/10b reserves slot 0 for metadata.
Commit d6c6a76f80a1 ("drm: Update MST First Link Slot Information Based on Encoding Format") added support for updating the topology state accordingly, and commit 41724ea273cd ("drm/amd/display: Add DP 2.0 MST DM Support") started using it in the amd driver.
This feels more than a little cumbersome, especially updating the information in atomic check. For i915, add the update to MST connector .compute_config hook rather than iterating over all MST managers and connectors in global mode config .atomic_check. Fingers crossed.
v3: - Propagate errors from intel_dp_mst_update_slots() (Ville)
v2: - Update in .compute_config() not .atomic_check (Ville)
Cc: Bhawanpreet Lakha Bhawanpreet.Lakha@amd.com Cc: Lyude Paul lyude@redhat.com Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Acked-by: Lyude Paul lyude@redhat.com Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- drivers/gpu/drm/i915/display/intel_dp_mst.c | 33 +++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 6b6eab507d30..e30e698aa684 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -99,6 +99,29 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, return 0; }
+static int intel_dp_mst_update_slots(struct intel_encoder *encoder, + struct intel_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder); + struct intel_dp *intel_dp = &intel_mst->primary->dp; + struct drm_dp_mst_topology_mgr *mgr = &intel_dp->mst_mgr; + struct drm_dp_mst_topology_state *topology_state; + u8 link_coding_cap = intel_dp_is_uhbr(crtc_state) ? + DP_CAP_ANSI_128B132B : DP_CAP_ANSI_8B10B; + + topology_state = drm_atomic_get_mst_topology_state(conn_state->state, mgr); + if (IS_ERR(topology_state)) { + drm_dbg_kms(&i915->drm, "slot update failed\n"); + return PTR_ERR(topology_state); + } + + drm_dp_mst_update_slots(topology_state, link_coding_cap); + + return 0; +} + static int intel_dp_mst_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) @@ -155,6 +178,10 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, if (ret) return ret;
+ ret = intel_dp_mst_update_slots(encoder, pipe_config, conn_state); + if (ret) + return ret; + pipe_config->limited_color_range = intel_dp_limited_color_range(pipe_config, conn_state);
@@ -357,6 +384,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state, struct intel_connector *connector = to_intel_connector(old_conn_state->connector); struct drm_i915_private *i915 = to_i915(connector->base.dev); + int start_slot = intel_dp_is_uhbr(old_crtc_state) ? 0 : 1; int ret;
drm_dbg_kms(&i915->drm, "active links %d\n", @@ -366,7 +394,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, connector->port);
- ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, 1); + ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, start_slot); if (ret) { drm_dbg_kms(&i915->drm, "failed to update payload %d\n", ret); } @@ -475,6 +503,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct intel_connector *connector = to_intel_connector(conn_state->connector); + int start_slot = intel_dp_is_uhbr(pipe_config) ? 0 : 1; int ret; bool first_mst_stream;
@@ -509,7 +538,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state,
intel_dp->active_mst_links++;
- ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, 1); + ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, start_slot);
/* * Before Gen 12 this is not done as part of
Try to avoid the timeout during debugging.
Cc: Uma Shankar uma.shankar@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Signed-off-by: Jani Nikula jani.nikula@intel.com --- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 0686da36c428..c4807f7f5430 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -1288,6 +1288,9 @@ intel_dp_128b132b_lane_cds(struct intel_dp *intel_dp, /* Time budget for the LANEx_CDS_DONE Sequence */ deadline = jiffies + msecs_to_jiffies((lttpr_count + 1) * 20);
+ /* FIXME: Give some slack for CDS. */ + deadline += msecs_to_jiffies(500); + for (;;) { usleep_range(2000, 3000);
On Thu, 03 Feb 2022, Jani Nikula jani.nikula@intel.com wrote:
v2 of https://patchwork.freedesktop.org/series/99324/
BR, Jani.
Jani Nikula (8): drm/dp: add drm_dp_128b132b_read_aux_rd_interval() drm/dp: add 128b/132b link status helpers from DP 2.0 E11 drm/dp: add some new DPCD macros from DP 2.0 E11
Maarten, Maxime, Thomas, can I get an ack for merging these via drm-intel please?
BR, Jani.
drm/i915/dp: move intel_dp_prepare_link_train() call drm/i915/dp: rewrite DP 2.0 128b/132b link training based on errata drm/i915/dp: add 128b/132b support to link status checks drm/i915/mst: update slot information for 128b/132b HACK: drm/i915/dp: give more time for CDS
drivers/gpu/drm/dp/drm_dp.c | 83 +++++ drivers/gpu/drm/i915/display/intel_dp.c | 39 ++- .../drm/i915/display/intel_dp_link_training.c | 288 +++++++++++++++++- .../drm/i915/display/intel_dp_link_training.h | 4 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 29 +- include/drm/dp/drm_dp_helper.h | 24 +- 6 files changed, 446 insertions(+), 21 deletions(-)
dri-devel@lists.freedesktop.org
-
Jani Nikula -
Ville Syrjälä