v6.1 stable backport request
cover v6.1 stable backport request
Stable team, please apply patch 1/1 in this patchset along with its dependencies to the v6.1 stable tree. The patch required a trivial rebase adding a header include, hence resending it, while its 2 dependencies listed at Cc: stable lines in the commit message can be cherry-picked as-is.
Thanks,
Imre
Imre Deak (1):
drm/i915/tc: Fix system resume MST mode restore for DP-alt sinks
.../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_tc.c | 51 +++++++++++++++++-- 2 files changed, 48 insertions(+), 4 deletions(-)
Signature · 1 line
2.37.2
PATCH 1/1 drm/i915/tc: Fix system resume MST mode restore for DP-alt sinks
commit 06f66261a1567d66b9d35c87393b6edfbea4c8f8 upstream.
At least restoring the MST topology during system resume needs to use AUX before the display HW readout->sanitization sequence is complete, but on TC ports the PHY may be in the wrong mode for this, resulting in the AUX transfers to fail.
The initial TC port mode is kept fixed as BIOS left it for the above HW readout sequence (to prevent changing the mode on an enabled port). If the port is disabled this initial mode is TBT - as in any case the PHY ownership is not held - even if a DP-alt sink is connected. Thus, the AUX transfers during this time will use TBT mode instead of the expected DP-alt mode and so time out.
Fix the above by connecting the PHY during port initialization if the port is disabled, which will switch to the expected mode (DP-alt in the above case).
As the encoder/pipe HW state isn't read-out yet at this point, check if the port is enabled based on the DDI_BUF enabled flag. Save the read-out initial mode, so intel_tc_port_sanitize_mode() can check this wrt. the read-out encoder HW state.
References: https://gitlab.freedesktop.org/drm/intel/-/issues/4306#note_1832688
Cc: <[email protected]> # 6.1.x: a82796a2e332: Fix TypeC mode initialization
Cc: <[email protected]> # 6.1.x: 67165722c27c: Fix TC port link ref init
--- .../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_tc.c | 51 +++++++++++++++++-- 2 files changed, 48 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +1 -0
@@ -1763,6 +1763,7 @@ struct intel_digital_port { bool tc_legacy_port:1;char tc_port_name[8 ];enum tc_port_mode tc_mode; +enum tc_port_mode tc_init_mode;enum phy_fia tc_phy_fia;u8 tc_phy_fia_idx;
drivers/gpu/drm/i915/display/intel_tc.c +47 -4
86 lines not on this page · raw message
Signature · 1 line
2.37.2
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for v6.1 stable backport request
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: v6.1 stable backport request
URL : https://patchwork.freedesktop.org/series/120468/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/120468/revisions/1/mbox/ not applied
Applying: drm/i915/tc: Fix system resume MST mode restore for DP-alt sinks
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/display/intel_tc.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/tc: Fix system resume MST mode restore for DP-alt sinks When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced
Greg Kroah-Hartman
maintainerQuoted 9 lines · Imre Deak
Stable team, please apply patch 1/1 in this patchset along with its dependencies to the v6.1 stable tree. The patch required a trivial rebase adding a header include, hence resending it, while its 2 dependencies listed at Cc: stable lines in the commit message can be cherry-picked as-is.
Thanks,
Imre
Quoted 6 lines
Imre Deak (1):
drm/i915/tc: Fix system resume MST mode restore for DP-alt sinks.../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_tc.c | 51 +++++++++++++++++-- 2 files changed, 48 insertions(+), 4 deletions(-)
All now queued up, thanks.
greg k-h