From: Runyu Xiao <runyu.xiao@seu.edu.cn>
To: alexander.deucher@amd.com, christian.koenig@amd.com
Cc: airlied@gmail.com, simona@ffwll.ch, kenneth.feng@amd.com,
kevinyang.wang@amd.com, amd-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
jianhao.xu@seu.edu.cn, runyu.xiao@seu.edu.cn,
stable@vger.kernel.org
Subject: [PATCH 1/2] drm/amdgpu/mes11: fix queue init wptr reset
Date: Tue, 2 Jun 2026 13:03:53 +0800 [thread overview]
Message-ID: <20260602050354.2237095-2-runyu.xiao@seu.edu.cn> (raw)
In-Reply-To: <20260602050354.2237095-1-runyu.xiao@seu.edu.cn>
mes_v11_0_queue_init() resets ring->wptr_cpu_addr with a plain 32-bit
store in the reset/suspend path even though the same carrier is
accessed with atomic64_set()/atomic64_read() and support_64bit_ptrs is
enabled.
This is not just a missing atomic annotation. The MES queue write
pointer is a shared 64-bit carrier, and *ring->wptr_cpu_addr = 0 only
clears the low 32 bits. A later atomic64_read() can then observe stale
high 32 bits instead of a real zeroed reset state.
Use atomic64_set((atomic64_t *)ring->wptr_cpu_addr, 0) so the reset
path updates the full 64-bit wptr with the same access family as the
existing readers and writers.
Build-tested by compiling mes_v11_0.o.
No AMDGPU hardware was available for end-to-end runtime testing.
Fixes: d81d75c99936 ("drm/amdgpu/gfx11: enable kiq to map mes ring")
Cc: stable@vger.kernel.org
Signed-off-by: Runyu Xiao <runyu.xiao@seu.edu.cn>
---
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
index a926a3307..e2f762c2e 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
@@ -1308,7 +1308,7 @@ static int mes_v11_0_queue_init(struct amdgpu_device *adev,
if ((pipe == AMDGPU_MES_SCHED_PIPE) &&
(amdgpu_in_reset(adev) || adev->in_suspend)) {
- *(ring->wptr_cpu_addr) = 0;
+ atomic64_set((atomic64_t *)ring->wptr_cpu_addr, 0);
*(ring->rptr_cpu_addr) = 0;
amdgpu_ring_clear_ring(ring);
}
--
2.34.1
next prev parent reply other threads:[~2026-06-02 5:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-02 5:03 [PATCH 0/2] drm/amdgpu: fix MES queue init wptr reset on atomic64 carriers Runyu Xiao
2026-06-02 5:03 ` Runyu Xiao [this message]
2026-06-02 9:49 ` [PATCH 1/2] drm/amdgpu/mes11: fix queue init wptr reset Christian König
2026-06-02 10:53 ` 肖润宇
2026-06-02 11:19 ` Christian König
2026-06-02 12:03 ` Runyu Xiao
2026-06-03 9:00 ` Runyu Xiao
2026-06-04 3:17 ` Claude review: " Claude Code Review Bot
2026-06-02 5:03 ` [PATCH 2/2] drm/amdgpu/mes12: " Runyu Xiao
2026-06-04 3:17 ` Claude review: " Claude Code Review Bot
2026-06-04 3:17 ` Claude review: drm/amdgpu: fix MES queue init wptr reset on atomic64 carriers Claude Code Review Bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260602050354.2237095-2-runyu.xiao@seu.edu.cn \
--to=runyu.xiao@seu.edu.cn \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jianhao.xu@seu.edu.cn \
--cc=kenneth.feng@amd.com \
--cc=kevinyang.wang@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=simona@ffwll.ch \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox