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 e1e75cf7334c0e31f4c37d715b964784d45685fa # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024081207-icing-state-944c@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: e1e75cf7334c ("drm/amd/display: Program CURSOR_DST_X_OFFSET in viewport space") ee8287e068a3 ("drm/amd/display: Fix cursor issues with ODMs and HW rotations") 319d4615518c ("drm/amd/display: mirror case cleanup for cursors") dd9d8c61ccff ("drm/amd/display: Minor cleanup for DCN401 cursor related code") ed79ab5a07c1 ("drm/amd/display: DCN401 cusor code update") 827416d45476 ("drm/amd/display: Fix multiple cursors when using 4 displays on a contiguous large surface") c2edec1676ca ("drm/amd/display: Fix incorrect cursor position for dcn401") 44b9a7cfc035 ("drm/amd/display: Fix ODM + underscan case with cursor") 70839da63605 ("drm/amd/display: Add new DCN401 sources") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
