The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 509580fad7323b6a5da27e8365cd488f3b57210e # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024073042-crux-ditch-2ce7@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 509580fad732 ("drm/i915/dp: Don't switch the LTTPR mode on an active link") 657586e474bd ("drm/i915: Add a DP1.2 compatible way to read LTTPR capabilities") 77f4ec2a4111 ("drm/i915/dp: remove accidental static on what should be a local variable") a421d8a99216 ("drm/i915/dp: rewrite DP 2.0 128b/132b link training based on errata") 92e438619d16 ("drm/i915/dp: move intel_dp_prepare_link_train() call") 6c4d46523bf3 ("drm/i915: Pimp link training debug prints") 1f662675335b ("drm/i915: Print the DP vswing adjustment request") be1525048c58 ("drm/i915: Show LTTPR in the TPS debug print") c6921d484d3f ("drm/i915: Prepare link training for per-lane drive settings") e722ab8b6968 ("drm/i915: Generalize .set_signal_levels()") 5bafd85dd770 ("drm/i915: Introduce has_buf_trans_select()") f820693bc238 ("drm/i915: Introduce has_iboost()") f6e3be98654e ("drm/i915: Fix DP clock recovery "voltage_tries" handling") 3b4da8315add ("drm/i915/dg2: use existing mechanisms for SNPS PHY translations") 0707570248b8 ("drm/i915/dp: pass crtc_state to intel_ddi_dp_level()") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
