From: Greg Kroah-Hartman Date: Thu, 30 Jul 2026 09:50:35 +0000 (+0200) Subject: fuzz cleanup X-Git-Tag: v5.10.262~4 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=77060f3640dfe58291af0f26b5b8225410ee35c0;p=thirdparty%2Fkernel%2Fstable-queue.git fuzz cleanup --- diff --git a/queue-7.1/drm-amdgpu-gfx11-replace-bug_on-with-warn_on.patch b/queue-7.1/drm-amdgpu-gfx11-replace-bug_on-with-warn_on.patch index c1dd84dda9..0eba5d18f5 100644 --- a/queue-7.1/drm-amdgpu-gfx11-replace-bug_on-with-warn_on.patch +++ b/queue-7.1/drm-amdgpu-gfx11-replace-bug_on-with-warn_on.patch @@ -15,14 +15,12 @@ Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- - drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 13 +++++-------- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) -diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c -index f856b0cf5bec..92c16392b916 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c -@@ -546,7 +546,7 @@ static void gfx_v11_0_wait_reg_mem(struct amdgpu_ring *ring, int eng_sel, +@@ -542,7 +542,7 @@ static void gfx_v11_0_wait_reg_mem(struc WAIT_REG_MEM_ENGINE(eng_sel))); if (mem_space) @@ -31,7 +29,7 @@ index f856b0cf5bec..92c16392b916 100644 amdgpu_ring_write(ring, addr0); amdgpu_ring_write(ring, addr1); amdgpu_ring_write(ring, ref); -@@ -5997,7 +5997,7 @@ static void gfx_v11_0_ring_emit_ib_gfx(struct amdgpu_ring *ring, +@@ -5953,7 +5953,7 @@ static void gfx_v11_0_ring_emit_ib_gfx(s } amdgpu_ring_write(ring, header); @@ -40,7 +38,7 @@ index f856b0cf5bec..92c16392b916 100644 amdgpu_ring_write(ring, #ifdef __BIG_ENDIAN (2 << 0) | -@@ -6032,7 +6032,7 @@ static void gfx_v11_0_ring_emit_ib_compute(struct amdgpu_ring *ring, +@@ -5988,7 +5988,7 @@ static void gfx_v11_0_ring_emit_ib_compu } amdgpu_ring_write(ring, PACKET3(PACKET3_INDIRECT_BUFFER, 2)); @@ -49,7 +47,7 @@ index f856b0cf5bec..92c16392b916 100644 amdgpu_ring_write(ring, #ifdef __BIG_ENDIAN (2 << 0) | -@@ -6065,9 +6065,9 @@ static void gfx_v11_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, +@@ -6021,9 +6021,9 @@ static void gfx_v11_0_ring_emit_fence(st * aligned if only send 32bit data low (discard data high) */ if (write64bit) @@ -61,7 +59,7 @@ index f856b0cf5bec..92c16392b916 100644 amdgpu_ring_write(ring, lower_32_bits(addr)); amdgpu_ring_write(ring, upper_32_bits(addr)); amdgpu_ring_write(ring, lower_32_bits(seq)); -@@ -6121,9 +6121,6 @@ static void gfx_v11_0_ring_emit_fence_kiq(struct amdgpu_ring *ring, u64 addr, +@@ -6077,9 +6077,6 @@ static void gfx_v11_0_ring_emit_fence_ki { struct amdgpu_device *adev = ring->adev; @@ -71,6 +69,3 @@ index f856b0cf5bec..92c16392b916 100644 /* write fence seq to the "addr" */ amdgpu_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3)); amdgpu_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) | --- -2.55.0 - diff --git a/queue-7.1/drm-amdgpu-soc24-reset-dgpu-if-suspend-got-aborted.patch b/queue-7.1/drm-amdgpu-soc24-reset-dgpu-if-suspend-got-aborted.patch index 366b30a42f..bae66c7068 100644 --- a/queue-7.1/drm-amdgpu-soc24-reset-dgpu-if-suspend-got-aborted.patch +++ b/queue-7.1/drm-amdgpu-soc24-reset-dgpu-if-suspend-got-aborted.patch @@ -31,14 +31,12 @@ Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- - drivers/gpu/drm/amd/amdgpu/soc24.c | 28 ++++++++++++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/soc24.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) -diff --git a/drivers/gpu/drm/amd/amdgpu/soc24.c b/drivers/gpu/drm/amd/amdgpu/soc24.c -index 265db9331d0b..9dce30d2bb8d 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc24.c +++ b/drivers/gpu/drm/amd/amdgpu/soc24.c -@@ -496,8 +496,36 @@ static int soc24_common_suspend(struct amdgpu_ip_block *ip_block) +@@ -515,8 +515,36 @@ static int soc24_common_suspend(struct a return soc24_common_hw_fini(ip_block); } @@ -75,6 +73,3 @@ index 265db9331d0b..9dce30d2bb8d 100644 return soc24_common_hw_init(ip_block); } --- -2.55.0 -