drm/i915/tc: Recover AUX channel after external TC port mode change
Subsystems (3)
PATCH 1/1 drm/i915/tc: Recover AUX channel after external TC port mode change
When Fn+F4 triggers mirror mode, the BIOS/EC reconfigures a TC port mode (e.g. DP-Alt to TBT-Alt via UCSI) without generating HPD. The driver's cached TC mode becomes stale, so intel_dp_aux_xfer() uses the wrong power domain and IO routing, and AUX transactions fail.
This occurs when the USB-C-to-HDMI dongle does not support TBT, so the mode switch creates a mismatch. It also occurs with slow monitors whose delayed HPD/DDC/EDID recovery causes the Type-C layer to settle on a stale tbt-alt state before the dongle finishes re-negotiation.
Add intel_tc_port_aux_recover() to detect hardware/cached TC mode divergence and reset the PHY. Wrap it with intel_dp_aux_xfer_with_recovery() to retry with corrected settings.
Tested on Panther Lake and Lunar Lake with a BenQ HDMI monitor via USB-C-to-HDMI dongle.
--- drivers/gpu/drm/i915/display/intel_dp_aux.c | 41 +++++++++-- drivers/gpu/drm/i915/display/intel_tc.c | 75 +++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_tc.h | 1 + 3 files changed, 113 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_aux.c +37 -4
@@ -481,6 +481,39 @@ static u32 intel_dp_aux_xfer_flags(const struct drm_dp_aux_msg *msg)return 0 ; } +/** +* intel_dp_aux_xfer_with_recovery - AUX transfer with TC port recovery +* @intel_dp: the DP port +* @send: buffer of bytes to send +* @send_bytes: number of bytes to send +* @recv: buffer to store received reply +* @recv_size: maximum number of bytes to receive +* @aux_send_ctl_flags: extra flags for the AUX send control register +* +* Wrapper around intel_dp_aux_xfer() that attempts to recover from an +* external TC port mode change (e.g., dp-alt -> tbt-alt via hotkey BIOS +* action) when the initial AUX transfer fails. On failure, recovery is +* attempted once via intel_tc_port_aux_recover() before retrying. +* +* Returns: number of received bytes on success, negative error code on failure. +*/ +static int +intel_dp_aux_xfer_with_recovery (struct intel_dp *intel_dp, +const u8 *send,int send_bytes, +u8 *recv,int recv_size, +u32 aux_send_ctl_flags) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +int ret; + + ret =intel_dp_aux_xfer (intel_dp, send, send_bytes, recv, recv_size, + aux_send_ctl_flags); +if (ret <0 &&intel_tc_port_aux_recover (dig_port)) + ret =intel_dp_aux_xfer (intel_dp, send, send_bytes, recv, + recv_size, aux_send_ctl_flags); +return ret; +} +static ssize_t intel_dp_aux_transfer (struct drm_dp_aux *aux,struct drm_dp_aux_msg *msg) {
@@ -508,8 +541,8 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)if (msg->buffer)memcpy (txbuf +HEADER_SIZE , msg->buffer, msg->size); - ret =intel_dp_aux_xfer (intel_dp, txbuf, txsize, - rxbuf, rxsize, flags); + ret =intel_dp_aux_xfer_with_recovery (intel_dp, txbuf, txsize, + rxbuf, rxsize, flags);if (ret >0 ) { msg->reply = rxbuf[0 ] >>4 ;
@@ -531,8 +564,8 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)if (drm_WARN_ON (display->drm, rxsize >20 ))return -E2BIG ; - ret =intel_dp_aux_xfer (intel_dp, txbuf, txsize, - rxbuf, rxsize, flags); + ret =intel_dp_aux_xfer_with_recovery (intel_dp, txbuf, txsize, + rxbuf, rxsize, flags);if (ret >0 ) { msg->reply = rxbuf[0 ] >>4 ;/*
drivers/gpu/drm/i915/display/intel_tc.c +75 -0
81 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_tc.h +1 -0
@@ -108,6 +108,7 @@ bool intel_tc_port_ref_held(struct intel_digital_port *dig_port);bool intel_tc_port_link_needs_reset (struct intel_digital_port *dig_port);bool intel_tc_port_link_reset (struct intel_digital_port *dig_port);void intel_tc_port_link_cancel_reset_work (struct intel_digital_port *dig_port); +bool intel_tc_port_aux_recover (struct intel_digital_port *dig_port);int intel_tc_port_init (struct intel_digital_port *dig_port,bool is_legacy);void intel_tc_port_cleanup (struct intel_digital_port *dig_port);
Signature · 1 line
2.34.1
Patchwork
CI✓ i915.CI.BAT: success for drm/i915/tc: Recover AUX channel after external TC port mode change
== Series Details ==
== Series Details ==
Series: drm/i915/tc: Recover AUX channel after external TC port mode change
URL : https://patchwork.freedesktop.org/series/165945/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_18410 -> Patchwork_165945v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/index.html
Participating hosts (41 -> 40)
------------------------------
Additional (1): bat-adls-6
Missing (2): bat-dg2-13 fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_165945v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@dmabuf@all-tests:
- bat-adls-6: NOTRUN -> [SKIP][1] ([i915#15931])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- bat-adls-6: NOTRUN -> [SKIP][2] ([i915#4613]) +3 other tests skip
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
* igt@gem_tiled_pread_basic@basic:
- bat-adls-6: NOTRUN -> [SKIP][3] ([i915#15656])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
* igt@intel_hwmon@hwmon-read:
- bat-adls-6: NOTRUN -> [SKIP][4] ([i915#7707]) +1 other test skip
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-adls-6: NOTRUN -> [SKIP][5] ([i915#4103]) +1 other test skip
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
* igt@kms_dsc@dsc-basic:
- bat-adls-6: NOTRUN -> [SKIP][6] ([i915#3555] / [i915#3840])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- bat-adls-6: NOTRUN -> [SKIP][7]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
* igt@kms_pm_backlight@basic-brightness:
- bat-adls-6: NOTRUN -> [SKIP][8] ([i915#5354])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
* igt@kms_psr@psr-primary-mmap-gtt:
- bat-adls-6: NOTRUN -> [SKIP][9] ([i915#1072] / [i915#9732]) +3 other tests skip
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
* igt@kms_setmode@basic-clone-single-crtc:
- bat-adls-6: NOTRUN -> [SKIP][10] ([i915#3555])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
* igt@prime_vgem@basic-fence-read:
- bat-adls-6: NOTRUN -> [SKIP][11] ([i915#3291]) +2 other tests skip
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-adls-6/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live:
- bat-mtlp-8: [DMESG-FAIL][12] ([i915#12061]) -> [PASS][13] +1 other test pass
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18410/bat-mtlp-8/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-mtlp-8/igt@[email protected]
- bat-dg2-8: [DMESG-FAIL][14] ([i915#12061]) -> [PASS][15] +1 other test pass
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18410/bat-dg2-8/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-dg2-8/igt@[email protected]
* igt@i915_selftest@live@workarounds:
- bat-mtlp-9: [DMESG-FAIL][16] ([i915#12061]) -> [PASS][17] +1 other test pass
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18410/bat-mtlp-9/igt@i915_selftest@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/bat-mtlp-9/igt@i915_selftest@[email protected]
[i915#1072]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1072
[i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061
[i915#15656]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15656
[i915#15931]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15931
[i915#3291]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3291
[i915#3555]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3555
[i915#3840]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3840
[i915#4103]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4103
[i915#4613]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4613
[i915#5354]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5354
[i915#7707]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7707
[i915#9732]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9732
Build changes
-------------
* Linux: CI_DRM_18410 -> Patchwork_165945v1
CI-20190529: 20190529
CI_DRM_18410: 5521e3e7a175fef7d7a35a4b8fd17ca473be8e7e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_8883: 8214859d2c4ecf8f81a08a3d2cd26f0a50d2b513 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_165945v1: 5521e3e7a175fef7d7a35a4b8fd17ca473be8e7e @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165945v1/index.html