From: Greg Kroah-Hartman Date: Wed, 29 Jul 2026 11:18:50 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v6.1.179~59 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=31fd2636005b31bc599cdf90134d1ebc1a75a5a1;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: drm-amdgpu-sdma5.0-replace-bug_on-with-warn_on.patch drm-amdgpu-sdma5.2-replace-bug_on-with-warn_on.patch --- diff --git a/queue-5.15/drm-amdgpu-sdma5.0-replace-bug_on-with-warn_on.patch b/queue-5.15/drm-amdgpu-sdma5.0-replace-bug_on-with-warn_on.patch new file mode 100644 index 0000000000..4ced09020f --- /dev/null +++ b/queue-5.15/drm-amdgpu-sdma5.0-replace-bug_on-with-warn_on.patch @@ -0,0 +1,40 @@ +From 9e98ed3113943257ad6e5c1e6beddbdb482a70ad Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Mon, 15 Jun 2026 18:26:28 -0400 +Subject: drm/amdgpu/sdma5.0: replace BUG_ON() with WARN_ON() + +From: Alex Deucher + +commit 9e98ed3113943257ad6e5c1e6beddbdb482a70ad upstream. + +There's no need to crash the kernel for these cases. + +Reviewed-by: Vitaly Prosyak +Signed-off-by: Alex Deucher +(cherry picked from commit 8d144a0eb09537055841af48c9e7c2d4cd48e84d) +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +@@ -552,7 +552,7 @@ static void sdma_v5_0_ring_emit_fence(st + amdgpu_ring_write(ring, SDMA_PKT_HEADER_OP(SDMA_OP_FENCE) | + SDMA_PKT_FENCE_HEADER_MTYPE(0x3)); /* Ucached(UC) */ + /* zero in first two bits */ +- BUG_ON(addr & 0x3); ++ WARN_ON(addr & 0x3); + amdgpu_ring_write(ring, lower_32_bits(addr)); + amdgpu_ring_write(ring, upper_32_bits(addr)); + amdgpu_ring_write(ring, lower_32_bits(seq)); +@@ -563,7 +563,7 @@ static void sdma_v5_0_ring_emit_fence(st + amdgpu_ring_write(ring, SDMA_PKT_HEADER_OP(SDMA_OP_FENCE) | + SDMA_PKT_FENCE_HEADER_MTYPE(0x3)); + /* zero in first two bits */ +- BUG_ON(addr & 0x3); ++ WARN_ON(addr & 0x3); + amdgpu_ring_write(ring, lower_32_bits(addr)); + amdgpu_ring_write(ring, upper_32_bits(addr)); + amdgpu_ring_write(ring, upper_32_bits(seq)); diff --git a/queue-5.15/drm-amdgpu-sdma5.2-replace-bug_on-with-warn_on.patch b/queue-5.15/drm-amdgpu-sdma5.2-replace-bug_on-with-warn_on.patch new file mode 100644 index 0000000000..8d33a7f87b --- /dev/null +++ b/queue-5.15/drm-amdgpu-sdma5.2-replace-bug_on-with-warn_on.patch @@ -0,0 +1,40 @@ +From b9dd618a635d39fbb211454b6e8837b2a7f10fb0 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Mon, 15 Jun 2026 18:27:15 -0400 +Subject: drm/amdgpu/sdma5.2: replace BUG_ON() with WARN_ON() + +From: Alex Deucher + +commit b9dd618a635d39fbb211454b6e8837b2a7f10fb0 upstream. + +There's no need to crash the kernel for these cases. + +Reviewed-by: Vitaly Prosyak +Signed-off-by: Alex Deucher +(cherry picked from commit ae658afc7f47f6147371ec42cc6b1a793dfdb5af) +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +@@ -449,7 +449,7 @@ static void sdma_v5_2_ring_emit_fence(st + amdgpu_ring_write(ring, SDMA_PKT_HEADER_OP(SDMA_OP_FENCE) | + SDMA_PKT_FENCE_HEADER_MTYPE(0x3)); /* Ucached(UC) */ + /* zero in first two bits */ +- BUG_ON(addr & 0x3); ++ WARN_ON(addr & 0x3); + amdgpu_ring_write(ring, lower_32_bits(addr)); + amdgpu_ring_write(ring, upper_32_bits(addr)); + amdgpu_ring_write(ring, lower_32_bits(seq)); +@@ -460,7 +460,7 @@ static void sdma_v5_2_ring_emit_fence(st + amdgpu_ring_write(ring, SDMA_PKT_HEADER_OP(SDMA_OP_FENCE) | + SDMA_PKT_FENCE_HEADER_MTYPE(0x3)); + /* zero in first two bits */ +- BUG_ON(addr & 0x3); ++ WARN_ON(addr & 0x3); + amdgpu_ring_write(ring, lower_32_bits(addr)); + amdgpu_ring_write(ring, upper_32_bits(addr)); + amdgpu_ring_write(ring, upper_32_bits(seq)); diff --git a/queue-5.15/series b/queue-5.15/series index 188ade29f3..0598901a93 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -144,3 +144,5 @@ can-bcm-track-a-single-source-interface-for-anydev-t.patch drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch drm-nouveau-acr-fix-missing-nvkm_done-in-error-path-of-nvkm_acr_oneinit.patch drm-radeon-fix-r100_copy_blit-for-large-bos.patch +drm-amdgpu-sdma5.2-replace-bug_on-with-warn_on.patch +drm-amdgpu-sdma5.0-replace-bug_on-with-warn_on.patch