Some correction in the DP Link Training sequence
Subsystems (3)
v2 cover Some correction in the DP Link Training sequence
Arun R Murthy (3):
drm/i915/dp: use fsleep instead of usleep_range for LT drm/i915/dp: read Aux RD interval just before setting the FFE preset drm/i915/dp: Include the time taken by AUX Tx for timeout
.../drm/i915/display/intel_dp_link_training.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/3 drm/i915/dp: use fsleep instead of usleep_range for LT
Sleeping for < 10us use udelay, for 10us to 20ms use usleep_range() and for > 10ms use msleep. flseep() will call the particular API based on the above condition. (Documentation/timers/timers-howto.rst) Aux RD Interval value depends on the value read from the dpcd register which is updated from the sink device, hence use flseep.
--- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_link_training.c +3 -3
@@ -898,7 +898,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp, voltage_tries =1 ;for (cr_tries =0 ; cr_tries < max_cr_tries; ++cr_tries) { -usleep_range (delay_us,2 * delay_us); +fsleep (delay_us);if (drm_dp_dpcd_read_phy_link_status (&intel_dp->aux, dp_phy, link_status) <0 ) {
@@ -1040,7 +1040,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp, }for (tries =0 ; tries <5 ; tries++) { -usleep_range (delay_us,2 * delay_us); +fsleep (delay_us);if (drm_dp_dpcd_read_phy_link_status (&intel_dp->aux, dp_phy, link_status) <0 ) {
@@ -1417,7 +1417,7 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp, deadline = jiffies +msecs_to_jiffies_timeout (400 );for (try =0 ; try < max_tries; try++) { -usleep_range (delay_us,2 * delay_us); +fsleep (delay_us);/* * The delay may get updated. The transmitter shall read the
Signature · 1 line
2.25.1
PATCH v3 2/3 drm/i915/dp: read Aux RD interval just before setting the FFE preset
In reply to Arun R MurthyFigure 3-52: 128b132b DP DPTC LANEx_CHANNEL_EQ_DONE Sequence of DP2.1a spec.
After reading LANEx_CHANNEL_EQ_DONE, read the FFE presets. AUX_RD_INTERVAL and then write the new FFE presets.
squash 2
--- .../gpu/drm/i915/display/intel_dp_link_training.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_link_training.c +7 -7
@@ -1419,12 +1419,6 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,for (try =0 ; try < max_tries; try++) {fsleep (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 ) {lt_err (intel_dp,DP_PHY_DPRX ,"Failed to read link status\n" );return false;
@@ -1451,8 +1445,14 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,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); +/* +* During LT, Tx shall read DPCD 02216h before DPCD 00202h to 00207h and +* 0200Ch through 0200Fh. +*/ + delay_us =drm_dp_128b132b_read_aux_rd_interval (&intel_dp->aux); + +/* Update signal levels and training set as requested. */ if (!intel_dp_update_link_train (intel_dp, crtc_state,DP_PHY_DPRX )) {lt_err (intel_dp,DP_PHY_DPRX ,"Failed to update TX FFE settings\n" );return false;
Signature · 1 line
2.25.1
PATCH v2 3/3 drm/i915/dp: Include the time taken by AUX Tx for timeout
In reply to Arun R MurthyAs per DP spec the timeout for LANE_CHANNEL_EQ_DONE is 400ms. But this timeout value is exclusively for the Aux RD Interval and excludes the time consumed for the AUX Tx (i.e reading/writing FFE presets). Add another 50ms for these AUX Tx to the 400ms timeout.
Ref: "Figure 3-52: 128b132b DP DPTC LANEx_CHANNEL_EQ_DONE Sequence" of DP2.1a spec.
--- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_dp_link_training.c +1 -1
@@ -1414,7 +1414,7 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp, }/* Time budget for the LANEx_EQ_DONE Sequence */ - deadline = jiffies +msecs_to_jiffies_timeout (400 ); + deadline = jiffies +msecs_to_jiffies_timeout (450 );for (try =0 ; try < max_tries; try++) {fsleep (delay_us);
Signature · 1 line
2.25.1