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 27e718ac8b8194d13eee5738c4d3fd247736186e # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024061904-refund-waking-de5e@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 27e718ac8b81 ("drm/amd/display: fix disable otg wa logic in DCN316") 72002056f771 ("drm/amd/display: Display distortion after hotplug 5K tiled display") d5c6909e7460 ("drm/amd/display: Add DCN314 clock manager") 8a077d9caa3a ("drm/amd/display: disable otg toggle w/a on boot") 66a197203794 ("drm/amd/display: Check zero planes for OTG disable W/A on clock change") f94903996140 ("drm/amd/display: Add DCN315 CLK_MGR") c477eaa6a79d ("drm/amd/display: Add DCN316 resource and SMU clock manager") 5f0c74915815 ("drm/amd/display: Fix for otg synchronization logic") 59d41458f143 ("Merge tag 'drm-next-2022-01-14' of git://anongit.freedesktop.org/drm/drm") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
