From: Greg Kroah-Hartman Date: Mon, 19 Aug 2024 10:22:56 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.1.107~127 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0af7ad3496579014339de33819d929693ee3aa1;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: drm-amdgpu-jpeg2-properly-set-atomics-vmid-field.patch --- diff --git a/queue-6.1/drm-amdgpu-jpeg2-properly-set-atomics-vmid-field.patch b/queue-6.1/drm-amdgpu-jpeg2-properly-set-atomics-vmid-field.patch new file mode 100644 index 00000000000..37ca3a117d9 --- /dev/null +++ b/queue-6.1/drm-amdgpu-jpeg2-properly-set-atomics-vmid-field.patch @@ -0,0 +1,36 @@ +From e414a304f2c5368a84f03ad34d29b89f965a33c9 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Fri, 12 Jul 2024 10:00:33 -0400 +Subject: drm/amdgpu/jpeg2: properly set atomics vmid field + +From: Alex Deucher + +commit e414a304f2c5368a84f03ad34d29b89f965a33c9 upstream. + +This needs to be set as well if the IB uses atomics. + +Reviewed-by: Leo Liu +Signed-off-by: Alex Deucher +(cherry picked from commit 35c628774e50b3784c59e8ca7973f03bcb067132) +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c +@@ -541,11 +541,11 @@ void jpeg_v2_0_dec_ring_emit_ib(struct a + + amdgpu_ring_write(ring, PACKETJ(mmUVD_LMI_JRBC_IB_VMID_INTERNAL_OFFSET, + 0, 0, PACKETJ_TYPE0)); +- amdgpu_ring_write(ring, (vmid | (vmid << 4))); ++ amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8))); + + amdgpu_ring_write(ring, PACKETJ(mmUVD_LMI_JPEG_VMID_INTERNAL_OFFSET, + 0, 0, PACKETJ_TYPE0)); +- amdgpu_ring_write(ring, (vmid | (vmid << 4))); ++ amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8))); + + amdgpu_ring_write(ring, PACKETJ(mmUVD_LMI_JRBC_IB_64BIT_BAR_LOW_INTERNAL_OFFSET, + 0, 0, PACKETJ_TYPE0)); diff --git a/queue-6.1/series b/queue-6.1/series index 884e26c2be0..8953af4140c 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -24,3 +24,4 @@ btrfs-zoned-properly-take-lock-to-read-update-block-group-s-zoned-variables.patc btrfs-tree-checker-add-dev-extent-item-checks.patch drm-amdgpu-actually-check-flags-for-all-context-ops.patch memcg_write_event_control-fix-a-user-triggerable-oops.patch +drm-amdgpu-jpeg2-properly-set-atomics-vmid-field.patch