drm/msm/dp: Introduce link training per-segment for LTTPRs
v5 cover drm/msm/dp: Introduce link training per-segment for LTTPRs
Recently added Initial LTTPR support in msm/dp has configured LTTPR(s) to non-transparent mode to enable video output on X1E-based devices that come with LTTPR on the motherboards. However, video would not work if additional LTTPR(s) are present between sink and source, which is the case for USB Type-C docks (eg. Dell WD19TB/WD22TB4), and at least some universal Thunderbolt/USB Type-C monitors (eg. Dell U2725QE).
First, take into account LTTPR capabilities when computing max link rate, number of lanes. Take into account previous discussion on the lists - exit early if reading DPCD caps failed. This also fixes "*ERROR* panel edid read failed" on some monitors which seems to be caused by msm_dp_panel_read_sink_caps running before LTTPR(s) are initialized.
Finally, implement link training per-segment. Pass lttpr_count to all required helpers.
This seems to also partially improve UI (Wayland) hanging when changing external display's link parameters (resolution, framerate):
* Prior to this series, via direct USB Type-C to display connection, attempt to change resolution or framerate hangs the UI, setting does not stick. Some back and forth replugging finally sets desired parameters.
* With this series, via direct USB Type-C to display connection, changing parameters works most of the time, without UI freezing. Via docking station/multiple LTTPRs the setting again does not stick.
* On Xorg changing link paramaters works in all combinations.
These appear to be mainlink initialization related, as in all cases LT passes successfully.
Test matrix:
* Dell XPS 9345, Ubuntu 24.10, Gnome 47, Wayland (myself)
* Left USB Type-C, Right USB Type-C
* Direct monitor connection, Dell WD19TB, Dell WD22TB4, USB Type-C to HDMI dongle, USB Type-C to DP dongle
* Dell AW3423DWF, Samsung LS24A600, dual Samsung LS24A600 (one monitor per USB Type-C connector)
* Dell XPS 9345, Ubuntu 24.10, Gnome 47, Wayland (myself)
* Left USB Type-C, Right USB Type-C
* Direct monitor connection
* Samsung S34BG85 (USB Type-C), Dell U2725QE (universal Thunderbolt/USB Type-C, probes with an LTTPR when in USB Type-C/DP Alt mode)
* Dell XPS 9345, Debian trixie/sid, Gnome 48, Wayland (Stefan Schmidt)
* Left USB Type-C, Right USB Type-C
* Dell WD15 Dock with DisplayPort connected
* Dell HD22Q dock with HDMI connected
* USB Type-C to HDMI dongle
* Dell U3417W
In both cases, "Thunderbot Support"/"USB4 PCIE Tunneling" was disabled in UEFI to force universal Thunderbolt/USB Type-C devices to work in DP Alt mode.
In both cases laptops had HBR3 patches applied [1], resulting in maximum successful link at 3440x1440@100hz and 4k@60hz respectively. When using Dell WD22TB4/U2725QE, USB Type-C pin assigment D got enabled and USB3.0 devices were working in parallel to video ouput.
Known issues:
* As mentioned above, it appears that on Gnome+Wayland framerate and resolution parameter adjustment is not stable.
Due to lack of access to the official DisplayPort specfication, changes were primarily inspired by/reverse engineered from Intel's i915 driver.
[1] https://lore.kernel.org/all/[email protected]/
---
Changes in v5:
- Altered 4/4 commit message to include LTTPR's max training level
context.
- Picked Abhinav's R-b tags
- Picked Jessica's T-b tags
- Link to v4: https://lore.kernel.org/all/[email protected]/
Changes in v4:
- Add 'Fixes' tag for entire series
- Rebase on 6.15-rc4 (was previously on top of msm-next)
- Picked Johan's, Rob's T-b tags
- Picked Dmitry's R-b tags
- Re-tested on X1E/X1P with DP->monitor, DP->dock->monitor
- Link to v3: https://lore.kernel.org/all/[email protected]/
Changes in v3:
- Split 1st patch into 3
- Simplified handling of max_lttpr_lanes/max_lttpr_rate
- Moved lttpr_common_caps to msm_dp_link (not msm_dp_panel, as LTTPRs
are link related, not panel related)
- Picked Stefan's T-b tag (last patch only, as 1st one is getting split)
- Droped Abel's R-b tags from 1st patch that got split due to high diff
- Fixed alignment issues, initialization of variables, debug prints
- Moved lttpr_count to avoid ugly pointer
- Link to v2: https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Picked up Abel's R-b tags
- Fixed typo as per Abel, fixed readability as per Johan
- Updated cover and commit message on mailink issue which appears to be specific to Gnome+Wayland. No problems on Xorg.
- Link to v1: https://lore.kernel.org/all/[email protected]/
Aleksandrs Vinarskis (4):
drm/msm/dp: Fix support of LTTPR initialization drm/msm/dp: Account for LTTPRs capabilities drm/msm/dp: Prepare for link training per-segment for LTTPRs drm/msm/dp: Introduce link training per-segment for LTTPRs
drivers/gpu/drm/msm/dp/dp_ctrl.c | 126 ++++++++++++++++++++-------- drivers/gpu/drm/msm/dp/dp_display.c | 27 ++++-- drivers/gpu/drm/msm/dp/dp_link.h | 4 + drivers/gpu/drm/msm/dp/dp_panel.c | 12 ++- 4 files changed, 122 insertions(+), 47 deletions(-)
Signature · 1 line
2.45.2
PATCH v5 1/4 drm/msm/dp: Fix support of LTTPR initialization
Initialize LTTPR before msm_dp_panel_read_sink_caps, as DPTX shall (re)read DPRX caps after LTTPR detection, as required by DP 2.1a, Section 3.6.7.6.1.
--- drivers/gpu/drm/msm/dp/dp_display.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +9 -4
@@ -367,12 +367,12 @@ static int msm_dp_display_send_hpd_notification(struct msm_dp_display_private *dreturn 0 ; } -static void msm_dp_display_lttpr_init (struct msm_dp_display_private *dp) +static void msm_dp_display_lttpr_init (struct msm_dp_display_private *dp,u8 *dpcd) {u8 lttpr_caps[DP_LTTPR_COMMON_CAP_SIZE ];int rc; -if (drm_dp_read_lttpr_common_caps (dp->aux, dp->panel->dpcd, lttpr_caps)) +if (drm_dp_read_lttpr_common_caps (dp->aux, dpcd, lttpr_caps))return ; rc =drm_dp_lttpr_init (dp->aux,drm_dp_lttpr_count (lttpr_caps));
@@ -385,12 +385,17 @@ static int msm_dp_display_process_hpd_high(struct msm_dp_display_private *dp)struct drm_connector *connector = dp->msm_dp_display.connector;const struct drm_display_info *info = &connector->display_info;int rc =0 ; +u8 dpcd[DP_RECEIVER_CAP_SIZE ]; - rc =msm_dp_panel_read_sink_caps (dp->panel, connector); + rc =drm_dp_read_dpcd_caps (dp->aux, dpcd);if (rc) goto end; -msm_dp_display_lttpr_init (dp); +msm_dp_display_lttpr_init (dp, dpcd); + + rc =msm_dp_panel_read_sink_caps (dp->panel, connector); +if (rc) + goto end;msm_dp_link_process_request (dp->link);
Signature · 1 line
2.45.2
PATCH v5 2/4 drm/msm/dp: Account for LTTPRs capabilities
In reply to Aleksandrs VinarskisTake into account LTTPR capabilities when selecting maximum allowed link rate, number of data lines.
--- drivers/gpu/drm/msm/dp/dp_display.c | 5 ++--- drivers/gpu/drm/msm/dp/dp_link.h | 3 +++ drivers/gpu/drm/msm/dp/dp_panel.c | 12 +++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +2 -3
@@ -369,13 +369,12 @@ static int msm_dp_display_send_hpd_notification(struct msm_dp_display_private *dstatic void msm_dp_display_lttpr_init (struct msm_dp_display_private *dp,u8 *dpcd) { -u8 lttpr_caps[DP_LTTPR_COMMON_CAP_SIZE ];int rc; -if (drm_dp_read_lttpr_common_caps (dp->aux, dpcd, lttpr_caps)) +if (drm_dp_read_lttpr_common_caps (dp->aux, dpcd, dp->link->lttpr_common_caps))return ; - rc =drm_dp_lttpr_init (dp->aux,drm_dp_lttpr_count (lttpr_caps)); + rc =drm_dp_lttpr_init (dp->aux,drm_dp_lttpr_count (dp->link->lttpr_common_caps));if (rc)DRM_ERROR ("failed to set LTTPRs transparency mode, rc=%d\n" , rc); }
drivers/gpu/drm/msm/dp/dp_link.h +3 -0
@@ -7,6 +7,7 @@#define _DP_LINK_H_#include "dp_aux.h" +#include <drm/display/drm_dp_helper.h> #define DS_PORT_STATUS_CHANGED 0x200#define DP_TEST_BIT_DEPTH_UNKNOWN 0xFFFFFFFF
@@ -60,6 +61,8 @@ struct msm_dp_link_phy_params { };struct msm_dp_link { +u8 lttpr_common_caps[DP_LTTPR_COMMON_CAP_SIZE ]; +u32 sink_request;u32 test_response;
drivers/gpu/drm/msm/dp/dp_panel.c +11 -1
@@ -47,7 +47,7 @@ static void msm_dp_panel_read_psr_cap(struct msm_dp_panel_private *panel)static int msm_dp_panel_read_dpcd (struct msm_dp_panel *msm_dp_panel) { -int rc; +int rc, max_lttpr_lanes, max_lttpr_rate;struct msm_dp_panel_private *panel;struct msm_dp_link_info *link_info;u8 *dpcd, major, minor;
@@ -75,6 +75,16 @@ static int msm_dp_panel_read_dpcd(struct msm_dp_panel *msm_dp_panel)if (link_info->rate > msm_dp_panel->max_dp_link_rate) link_info->rate = msm_dp_panel->max_dp_link_rate; +/* Limit data lanes from LTTPR capabilities, if any */ + max_lttpr_lanes =drm_dp_lttpr_max_lane_count (panel->link->lttpr_common_caps); +if (max_lttpr_lanes && max_lttpr_lanes < link_info->num_lanes) + link_info->num_lanes = max_lttpr_lanes; + +/* Limit link rate from LTTPR capabilities, if any */ + max_lttpr_rate =drm_dp_lttpr_max_link_rate (panel->link->lttpr_common_caps); +if (max_lttpr_rate && max_lttpr_rate < link_info->rate) + link_info->rate = max_lttpr_rate; +drm_dbg_dp (panel->drm_dev,"version: %d.%d\n" , major, minor);drm_dbg_dp (panel->drm_dev,"link_rate=%d\n" , link_info->rate);drm_dbg_dp (panel->drm_dev,"lane_count=%d\n" , link_info->num_lanes);
Signature · 1 line
2.45.2
PATCH v5 3/4 drm/msm/dp: Prepare for link training per-segment for LTTPRs
In reply to Aleksandrs VinarskisPer-segment link training requires knowing the number of LTTPRs (if any) present. Store the count during LTTPRs' initialization.
--- drivers/gpu/drm/msm/dp/dp_display.c | 17 +++++++++++------ drivers/gpu/drm/msm/dp/dp_link.h | 1 + 2 files changed, 12 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +11 -6
@@ -367,16 +367,21 @@ static int msm_dp_display_send_hpd_notification(struct msm_dp_display_private *dreturn 0 ; } -static void msm_dp_display_lttpr_init (struct msm_dp_display_private *dp,u8 *dpcd) +static int msm_dp_display_lttpr_init (struct msm_dp_display_private *dp,u8 *dpcd) { -int rc; +int rc, lttpr_count;if (drm_dp_read_lttpr_common_caps (dp->aux, dpcd, dp->link->lttpr_common_caps)) -return ; +return 0 ; - rc =drm_dp_lttpr_init (dp->aux,drm_dp_lttpr_count (dp->link->lttpr_common_caps)); -if (rc) + lttpr_count =drm_dp_lttpr_count (dp->link->lttpr_common_caps); + rc =drm_dp_lttpr_init (dp->aux, lttpr_count); +if (rc) {DRM_ERROR ("failed to set LTTPRs transparency mode, rc=%d\n" , rc); +return 0 ; + } + +return lttpr_count; }static int msm_dp_display_process_hpd_high (struct msm_dp_display_private *dp)
@@ -390,7 +395,7 @@ static int msm_dp_display_process_hpd_high(struct msm_dp_display_private *dp)if (rc) goto end; -msm_dp_display_lttpr_init (dp, dpcd); + dp->link->lttpr_count =msm_dp_display_lttpr_init (dp, dpcd); rc =msm_dp_panel_read_sink_caps (dp->panel, connector);if (rc)
drivers/gpu/drm/msm/dp/dp_link.h +1 -0
@@ -62,6 +62,7 @@ struct msm_dp_link_phy_params {struct msm_dp_link {u8 lttpr_common_caps[DP_LTTPR_COMMON_CAP_SIZE ]; +int lttpr_count;u32 sink_request;u32 test_response;
Signature · 1 line
2.45.2
PATCH v5 4/4 drm/msm/dp: Introduce link training per-segment for LTTPRs
In reply to Aleksandrs VinarskisDisplayPort requires per-segment link training when LTTPR are switched to non-transparent mode, starting with LTTPR closest to the source. Only when each segment is trained individually, source can link train to sink.
Implement per-segment link traning when LTTPR(s) are detected, to support external docking stations. On higher level, changes are:
* Pass phy being trained down to all required helpers
* Run CR, EQ link training per phy
* Set voltage swing, pre-emphasis levels per phy
Since at least some LTTPRs (eg. Parade PS8830) do not correctly report voltage-swing, pre-emphasis level 3 support, always assume level 3 is supported. This is permitted under DP 2.1(a) section 3.6.7.2 stating that LTTPR shall set its transmitter levels as close as possible to those requested by the DPTX, if the DPTX sets the voltage swing or pre-emphasis to a level that the LTTPR does not support. It shall be noted that LTTPR’s level choosing is implementation-specific.
This ensures successful link training both when connected directly to the monitor (single LTTPR onboard most X1E laptops) and via the docking station (at least two LTTPRs).
--- drivers/gpu/drm/msm/dp/dp_ctrl.c | 126 ++++++++++++++++++++++--------- 1 file changed, 89 insertions(+), 37 deletions(-)
drivers/gpu/drm/msm/dp/dp_ctrl.c +89 -37
@@ -1034,10 +1034,12 @@ static int msm_dp_ctrl_set_vx_px(struct msm_dp_ctrl_private *ctrl,return 0 ; } -static int msm_dp_ctrl_update_vx_px (struct msm_dp_ctrl_private *ctrl) +static int msm_dp_ctrl_update_phy_vx_px (struct msm_dp_ctrl_private *ctrl, +enum drm_dp_phy dp_phy) {struct msm_dp_link *link = ctrl->link; -int ret =0 , lane, lane_cnt; +int lane, lane_cnt, reg; +int ret =0 ;u8 buf[4 ];u32 max_level_reached =0 ;u32 voltage_swing_level = link->phy_params.v_level;
@@ -1075,8 +1077,13 @@ static int msm_dp_ctrl_update_vx_px(struct msm_dp_ctrl_private *ctrl)drm_dbg_dp (ctrl->drm_dev,"sink: p|v=0x%x\n" , voltage_swing_level | pre_emphasis_level); - ret =drm_dp_dpcd_write (ctrl->aux,DP_TRAINING_LANE0_SET , - buf, lane_cnt); + +if (dp_phy ==DP_PHY_DPRX ) + reg =DP_TRAINING_LANE0_SET ; +else + reg =DP_TRAINING_LANE0_SET_PHY_REPEATER (dp_phy); + + ret =drm_dp_dpcd_write (ctrl->aux, reg, buf, lane_cnt);if (ret == lane_cnt) ret =0 ;
@@ -1084,9 +1091,10 @@ static int msm_dp_ctrl_update_vx_px(struct msm_dp_ctrl_private *ctrl) }static bool msm_dp_ctrl_train_pattern_set (struct msm_dp_ctrl_private *ctrl, -u8 pattern) +u8 pattern,enum drm_dp_phy dp_phy) {u8 buf; +int reg;int ret =0 ;drm_dbg_dp (ctrl->drm_dev,"sink: pattern=%x\n" , pattern);
@@ -1096,7 +1104,12 @@ static bool msm_dp_ctrl_train_pattern_set(struct msm_dp_ctrl_private *ctrl,if (pattern && pattern !=DP_TRAINING_PATTERN_4 ) buf |=DP_LINK_SCRAMBLING_DISABLE ; - ret =drm_dp_dpcd_writeb (ctrl->aux,DP_TRAINING_PATTERN_SET , buf); +if (dp_phy ==DP_PHY_DPRX ) + reg =DP_TRAINING_PATTERN_SET ; +else + reg =DP_TRAINING_PATTERN_SET_PHY_REPEATER (dp_phy); + + ret =drm_dp_dpcd_writeb (ctrl->aux, reg, buf);return ret ==1 ; }
@@ -1115,12 +1128,16 @@ static int msm_dp_ctrl_read_link_status(struct msm_dp_ctrl_private *ctrl, }static int msm_dp_ctrl_link_train_1 (struct msm_dp_ctrl_private *ctrl, -int *training_step) +int *training_step,enum drm_dp_phy dp_phy) { +int delay_us;int tries, old_v_level, ret =0 ;u8 link_status[DP_LINK_STATUS_SIZE ];int const maximum_retries =4 ; + delay_us =drm_dp_read_clock_recovery_delay (ctrl->aux, + ctrl->panel->dpcd, dp_phy, false); +msm_dp_catalog_ctrl_state_ctrl (ctrl->catalog,0 ); *training_step =DP_TRAINING_1 ;
@@ -1129,18 +1146,19 @@ static int msm_dp_ctrl_link_train_1(struct msm_dp_ctrl_private *ctrl,if (ret)return ret;msm_dp_ctrl_train_pattern_set (ctrl,DP_TRAINING_PATTERN_1 | -DP_LINK_SCRAMBLING_DISABLE ); +DP_LINK_SCRAMBLING_DISABLE , dp_phy); - ret =msm_dp_ctrl_update_vx_px (ctrl); +msm_dp_link_reset_phy_params_vx_px (ctrl->link); + ret =msm_dp_ctrl_update_phy_vx_px (ctrl, dp_phy);if (ret)return ret; tries =0 ; old_v_level = ctrl->link->phy_params.v_level;for (tries =0 ; tries < maximum_retries; tries++) { -drm_dp_link_train_clock_recovery_delay (ctrl->aux, ctrl->panel->dpcd); +fsleep (delay_us); - ret =msm_dp_ctrl_read_link_status (ctrl, link_status); + ret =drm_dp_dpcd_read_phy_link_status (ctrl->aux, dp_phy, link_status);if (ret)return ret;
@@ -1161,7 +1179,7 @@ static int msm_dp_ctrl_link_train_1(struct msm_dp_ctrl_private *ctrl, }msm_dp_link_adjust_levels (ctrl->link, link_status); - ret =msm_dp_ctrl_update_vx_px (ctrl); + ret =msm_dp_ctrl_update_phy_vx_px (ctrl, dp_phy);if (ret)return ret; }
@@ -1213,21 +1231,31 @@ static int msm_dp_ctrl_link_lane_down_shift(struct msm_dp_ctrl_private *ctrl)return 0 ; } -static void msm_dp_ctrl_clear_training_pattern (struct msm_dp_ctrl_private *ctrl) +static void msm_dp_ctrl_clear_training_pattern (struct msm_dp_ctrl_private *ctrl, +enum drm_dp_phy dp_phy) { -msm_dp_ctrl_train_pattern_set (ctrl,DP_TRAINING_PATTERN_DISABLE ); -drm_dp_link_train_channel_eq_delay (ctrl->aux, ctrl->panel->dpcd); +int delay_us; + +msm_dp_ctrl_train_pattern_set (ctrl,DP_TRAINING_PATTERN_DISABLE , dp_phy); + + delay_us =drm_dp_read_channel_eq_delay (ctrl->aux, + ctrl->panel->dpcd, dp_phy, false); +fsleep (delay_us); }static int msm_dp_ctrl_link_train_2 (struct msm_dp_ctrl_private *ctrl, -int *training_step) +int *training_step,enum drm_dp_phy dp_phy) { +int delay_us;int tries =0 , ret =0 ;u8 pattern;u32 state_ctrl_bit;int const maximum_retries =5 ;u8 link_status[DP_LINK_STATUS_SIZE ]; + delay_us =drm_dp_read_channel_eq_delay (ctrl->aux, + ctrl->panel->dpcd, dp_phy, false); +msm_dp_catalog_ctrl_state_ctrl (ctrl->catalog,0 ); *training_step =DP_TRAINING_2 ;
@@ -1247,12 +1275,12 @@ static int msm_dp_ctrl_link_train_2(struct msm_dp_ctrl_private *ctrl,if (ret)return ret; -msm_dp_ctrl_train_pattern_set (ctrl, pattern); +msm_dp_ctrl_train_pattern_set (ctrl, pattern, dp_phy);for (tries =0 ; tries <= maximum_retries; tries++) { -drm_dp_link_train_channel_eq_delay (ctrl->aux, ctrl->panel->dpcd); +fsleep (delay_us); - ret =msm_dp_ctrl_read_link_status (ctrl, link_status); + ret =drm_dp_dpcd_read_phy_link_status (ctrl->aux, dp_phy, link_status);if (ret)return ret;
@@ -1262,7 +1290,7 @@ static int msm_dp_ctrl_link_train_2(struct msm_dp_ctrl_private *ctrl, }msm_dp_link_adjust_levels (ctrl->link, link_status); - ret =msm_dp_ctrl_update_vx_px (ctrl); + ret =msm_dp_ctrl_update_phy_vx_px (ctrl, dp_phy);if (ret)return ret;
@@ -1271,9 +1299,32 @@ static int msm_dp_ctrl_link_train_2(struct msm_dp_ctrl_private *ctrl,return -ETIMEDOUT ; } +static int msm_dp_ctrl_link_train_1_2 (struct msm_dp_ctrl_private *ctrl, +int *training_step,enum drm_dp_phy dp_phy) +{ +int ret; + + ret =msm_dp_ctrl_link_train_1 (ctrl, training_step, dp_phy); +if (ret) { +DRM_ERROR ("link training #1 on phy %d failed. ret=%d\n" , dp_phy, ret); +return ret; + } +drm_dbg_dp (ctrl->drm_dev,"link training #1 on phy %d successful\n" , dp_phy); + + ret =msm_dp_ctrl_link_train_2 (ctrl, training_step, dp_phy); +if (ret) { +DRM_ERROR ("link training #2 on phy %d failed. ret=%d\n" , dp_phy, ret); +return ret; + } +drm_dbg_dp (ctrl->drm_dev,"link training #2 on phy %d successful\n" , dp_phy); + +return 0 ; +} +static int msm_dp_ctrl_link_train (struct msm_dp_ctrl_private *ctrl,int *training_step) { +int i;int ret =0 ;const u8 *dpcd = ctrl->panel->dpcd;u8 encoding[] = {0 ,DP_SET_ANSI_8B10B };
@@ -1286,8 +1337,6 @@ static int msm_dp_ctrl_link_train(struct msm_dp_ctrl_private *ctrl, link_info.rate = ctrl->link->link_params.rate; link_info.capabilities =DP_LINK_CAP_ENHANCED_FRAMING ; -msm_dp_link_reset_phy_params_vx_px (ctrl->link); -msm_dp_aux_link_configure (ctrl->aux, &link_info);if (drm_dp_max_downspread (dpcd))
@@ -1302,24 +1351,27 @@ static int msm_dp_ctrl_link_train(struct msm_dp_ctrl_private *ctrl, &assr, 1); } - ret =msm_dp_ctrl_link_train_1 (ctrl, training_step); +for (i = ctrl->link->lttpr_count -1 ; i >=0 ; i--) { +enum drm_dp_phy dp_phy =DP_PHY_LTTPR (i); + + ret =msm_dp_ctrl_link_train_1_2 (ctrl, training_step, dp_phy); +msm_dp_ctrl_clear_training_pattern (ctrl, dp_phy); + +if (ret) +break ; + } +if (ret) { -DRM_ERROR ("link training #1 failed. ret=%d\n" , ret); +DRM_ERROR ("link training of LTTPR(s) failed. ret=%d\n" , ret); goto end; } -/* print success info as this is a result of user initiated action */ -drm_dbg_dp (ctrl->drm_dev,"link training #1 successful\n" ); - - ret =msm_dp_ctrl_link_train_2 (ctrl, training_step); + ret =msm_dp_ctrl_link_train_1_2 (ctrl, training_step,DP_PHY_DPRX );if (ret) { -DRM_ERROR ("link training #2 failed. ret=%d\n" , ret); +DRM_ERROR ("link training on sink failed. ret=%d\n" , ret); goto end; } -/* print success info as this is a result of user initiated action */ -drm_dbg_dp (ctrl->drm_dev,"link training #2 successful\n" ); - end:msm_dp_catalog_ctrl_state_ctrl (ctrl->catalog,0 );
@@ -1636,7 +1688,7 @@ static int msm_dp_ctrl_link_maintenance(struct msm_dp_ctrl_private *ctrl)if (ret) goto end; -msm_dp_ctrl_clear_training_pattern (ctrl); +msm_dp_ctrl_clear_training_pattern (ctrl,DP_PHY_DPRX );msm_dp_catalog_ctrl_state_ctrl (ctrl->catalog,DP_STATE_CTRL_SEND_VIDEO );
@@ -1660,7 +1712,7 @@ static bool msm_dp_ctrl_send_phy_test_pattern(struct msm_dp_ctrl_private *ctrl)return false; }msm_dp_catalog_ctrl_send_phy_pattern (ctrl->catalog, pattern_requested); -msm_dp_ctrl_update_vx_px (ctrl); +msm_dp_ctrl_update_phy_vx_px (ctrl,DP_PHY_DPRX );msm_dp_link_send_test_response (ctrl->link); pattern_sent =msm_dp_catalog_ctrl_read_phy_pattern (ctrl->catalog);
@@ -1902,7 +1954,7 @@ int msm_dp_ctrl_on_link(struct msm_dp_ctrl *msm_dp_ctrl) }/* stop link training before start re training */ -msm_dp_ctrl_clear_training_pattern (ctrl); +msm_dp_ctrl_clear_training_pattern (ctrl,DP_PHY_DPRX ); } rc =msm_dp_ctrl_reinitialize_mainlink (ctrl);
@@ -1926,7 +1978,7 @@ int msm_dp_ctrl_on_link(struct msm_dp_ctrl *msm_dp_ctrl)* link training failed * end txing train pattern here */ -msm_dp_ctrl_clear_training_pattern (ctrl); +msm_dp_ctrl_clear_training_pattern (ctrl,DP_PHY_DPRX );msm_dp_ctrl_deinitialize_mainlink (ctrl); rc = -ECONNRESET ;
@@ -1997,7 +2049,7 @@ int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl, bool force_link_trainmsm_dp_ctrl_link_retrain (ctrl);/* stop txing train pattern to end link training */ -msm_dp_ctrl_clear_training_pattern (ctrl); +msm_dp_ctrl_clear_training_pattern (ctrl,DP_PHY_DPRX );/* * Set up transfer unit values and set controller state to send
Signature · 1 line
2.45.2