The patch below does not apply to the 5.4-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.4.y git checkout FETCH_HEAD git cherry-pick -x 470516c2925493594a690bc4d05b1f4471d9f996 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024081923-overhear-yard-8281@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 470516c29254 ("drm/amd/amdgpu: command submission parser for JPEG") e6c6bd6253e7 ("drm/amdgpu/jpeg4: properly set atomics vmid field") dfad65c65728 ("drm/amdgpu: Add JPEG5 support") 8f98a715da8e ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_5") 35d54e21e002 ("drm/amdgpu: Initialize jpeg v4_0_3 ras function") 570df4bca618 ("drm/amdgpu: Add reset_ras_error_count for jpeg v4_0_3") 41e491d8b606 ("drm/amdgpu: Add query_ras_error_count for jpeg v4_0_3") e684e654eba9 ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_3") bf35dbc13585 ("drm/amdgpu/jpeg: enable jpeg v4_0 for sriov") 86e8255f941e ("drm/amdgpu: add JPEG 4.0 RAS poison consumption handling") 533174580133 ("drm/amdgpu: add RAS error query for JPEG 4.0") f4b92fcd740d ("drm/amdgpu: cleanup CS pass2 v6") d4e8ad908b20 ("drm/amdgpu: reorder CS code") 88c98d54b220 ("drm/amdgpu: cleanup CS init/fini and pass1") dd80d9c8eeca ("drm/amdgpu: revert "partial revert "remove ctx->lock" v2"") 9b94c609cc17 ("drm/amdgpu: remove SRIOV and MCBP dependencies from the CS") 63127922e155 ("drm/amdgpu/vcn: Add MMSCH v4_0 support for sriov") aa44beb5f015 ("drm/amdgpu/vcn: Add sriov VCN v4_0 unified queue support") dc5f3829a752 ("drm/amdgpu: sriov remove vcn_4_0 and jpeg_4_0") 5df79aeb6e08 ("drm/amdgpu: Protect the amdgpu_bo_list list with a mutex v2") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
