The patch below does not apply to the 5.10-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.10.y git checkout FETCH_HEAD git cherry-pick -x 364b1c1de6de36c1b28690265c904c682aecc266 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024061959-finale-leotard-a13f@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 364b1c1de6de ("drm/amd/display: Adjust dprefclk by down spread percentage.") 1ba65e749dc6 ("drm/amd/display: Send DTBCLK disable message on first commit") 3a6a32b31a11 ("Revert "drm/amd/display: Send DTBCLK disable message on first commit"") f2a905b01c6d ("drm/amd/display: fix invalid reg access on DCN35 FPGA") f341055b10bd ("drm/amd/display: Send DTBCLK disable message on first commit") 038c53234641 ("drm/amd/display: Update P010 scaling cap") 17e74e11ac2b ("drm/amd/display: To adjust dprefclk by down spread percentage") 23cf5a5cd33a ("drm/amd/display: insert drv-pmfw log + rollback to new context") 061a5bf210cd ("drm/amd/display: Allow DTBCLK disable for DCN35") 220db802cb50 ("drm/amd/display: Do not read DPREFCLK spread info from LUT on DCN35") fd7cedccdde3 ("drm/amd/display: Fix OTG disable workaround logic") 1288d7020809 ("drm/amd/display: Improve x86 and dmub ips handshake") c0f8b83188c7 ("drm/amd/display: disable IPS") 93a66cef607c ("drm/amd/display: Add IPS control flag") dc01c4b79bfe ("drm/amd/display: Update driver and IPS interop") 4f43d753bf9c ("drm/amd/display: Correct z8 watermark mask") 0fa45b6aeae4 ("drm/amd/display: Add DCN35 Resource") ec129fa356be ("drm/amd/display: Add DCN35 init") 65138eb72e1f ("drm/amd/display: Add DCN35 DMUB") 8774029f76b9 ("drm/amd/display: Add DCN35 CLK_MGR") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
