This is a note to let you know that I've just added the patch titled
drm/amdgpu: Skip mark offset for high priority rings
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-skip-mark-offset-for-high-priority-rings.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable-owner@xxxxxxxxxxxxxxx Fri Jul 7 17:08:14 2023
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Fri, 7 Jul 2023 11:07:28 -0400
Subject: drm/amdgpu: Skip mark offset for high priority rings
To: <stable@xxxxxxxxxxxxxxx>
Cc: <mario.limonciello@xxxxxxx>, Jiadong Zhu <Jiadong.Zhu@xxxxxxx>, "Alex Deucher" <alexander.deucher@xxxxxxx>
Message-ID: <20230707150734.746135-3-alexander.deucher@xxxxxxx>
From: Jiadong Zhu <Jiadong.Zhu@xxxxxxx>
commit ef3c36a6e025e9b16ca3321479ba016841fa17a0 upstream
Only low priority rings are using chunks to save the offset.
Bypass the mark offset callings from high priority rings.
Signed-off-by: Jiadong Zhu <Jiadong.Zhu@xxxxxxx>
Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
(cherry picked from commit ef3c36a6e025e9b16ca3321479ba016841fa17a0)
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 3 +++
1 file changed, 3 insertions(+)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c
@@ -423,6 +423,9 @@ void amdgpu_sw_ring_ib_mark_offset(struc
struct amdgpu_ring_mux *mux = &adev->gfx.muxer;
unsigned offset;
+ if (ring->hw_prio > AMDGPU_RING_PRIO_DEFAULT)
+ return;
+
offset = ring->wptr & ring->buf_mask;
amdgpu_ring_mux_ib_mark_offset(mux, ring, offset, type);
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-6.4/drm-amd-pm-revise-the-aspm-settings-for-thunderbolt-attached-scenario.patch
queue-6.4/drm-amdgpu-make-sure-that-bos-have-a-backing-store.patch
queue-6.4/drm-amd-pm-add-abnormal-fan-detection-for-smu-13.0.0.patch
queue-6.4/drm-amdgpu-check-ras-irq-existence-for-vcn-jpeg.patch
queue-6.4/drm-amdgpu-sdma4-set-align-mask-to-255.patch
queue-6.4/drm-amdgpu-make-sure-bos-are-locked-in-amdgpu_vm_get_memory.patch
queue-6.4/drm-amdgpu-skip-mark-offset-for-high-priority-rings.patch
