From: Jesse Zhang <Jesse.Zhang@amd.com>
To: <amd-gfx@lists.freedesktop.org>
Cc: <Alexander.Deucher@amd.com>,
Christian Koenig <christian.koenig@amd.com>,
Jesse.zhang <Jesse.zhang@amd.com>,
Jesse Zhang <Jesse.Zhang@amd.com>
Subject: [PATCH v2 11/11] drm/amdgpu/userq_fence: wake gangs-out SDMA UMQs via NOTIFY
Date: Mon, 27 Apr 2026 16:34:37 +0800 [thread overview]
Message-ID: <20260427083543.1328533-11-Jesse.Zhang@amd.com> (raw)
In-Reply-To: <20260427083543.1328533-1-Jesse.Zhang@amd.com>
From: "Jesse.zhang" <Jesse.zhang@amd.com>
SDMA has no CP_UNMAPPED_DOORBELL HW intercept, so once MES gangs the
queue out (after the first IB idles it) per-queue doorbell rings from
userspace hit a mapped-out HW slot and are silently dropped: rptr
stops advancing and FENCE IRQ never fires.
After the SDMA UMQ's first IB has actually completed
(fence_drv->cpu_addr != 0), issue
MES_MISC_OP_NOTIFY_WORK_ON_UNMAPPED_QUEUE and ring the priority's
aggregated doorbell so MES re-evaluates scheduling and re-maps the
queue for the next IB. The first submission is intentionally skipped
— the queue is still mapped from MAP_QUEUE then, and an extra notify
would race the initial scheduling.
Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
---
.../gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
index a58342c2ac44..6ef4cbd5d5da 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
@@ -598,6 +598,39 @@ int amdgpu_userq_signal_ioctl(struct drm_device *dev, void *data,
/* drop the reference acquired in fence creation function */
dma_fence_put(fence);
+ /*
+ * SDMA UMQ wake: SDMA has no CP_UNMAPPED_DOORBELL HW intercept, so
+ * once MES gangs the queue out (after the first IB's PROTECTED_FENCE
+ * idles the queue), subsequent per-queue doorbell rings hit a
+ * mapped-out HW slot and are silently ignored — rptr stops
+ * advancing, FENCE IRQ never fires. The MES MISC API
+ * NOTIFY_WORK_ON_UNMAPPED_QUEUE flips MES's hasReadyQueues flag for
+ * the queue's priority level, which makes MES re-evaluate
+ * scheduling and re-map our SDMA UMQ for the next IB.
+ *
+ * Skip on the very first submission (fence_drv->cpu_addr == 0
+ * means SDMA hasn't completed any IB yet, so MES still has the
+ * queue mapped from MAP_QUEUE — calling NOTIFY here would race the
+ * initial scheduling and starve the first IB).
+ */
+ if (queue && queue->queue_type == AMDGPU_HW_IP_DMA &&
+ adev->enable_mes && adev->mes.funcs->misc_op &&
+ queue->fence_drv && queue->fence_drv->cpu_addr &&
+ le64_to_cpu(*queue->fence_drv->cpu_addr) != 0) {
+ struct mes_misc_op_input op = { 0 };
+ u32 agg_db = adev->mes.aggregated_doorbells[
+ AMDGPU_MES_PRIORITY_LEVEL_NORMAL];
+
+ op.op = MES_MISC_OP_NOTIFY_WORK_ON_UNMAPPED_QUEUE;
+ op.notify_work.priority_level = AMDGPU_MES_PRIORITY_LEVEL_NORMAL;
+ amdgpu_mes_lock(&adev->mes);
+ (void)adev->mes.funcs->misc_op(&adev->mes, &op);
+ amdgpu_mes_unlock(&adev->mes);
+
+ if (agg_db)
+ WDOORBELL64(agg_db, queue->doorbell_index);
+ }
+
exec_fini:
drm_exec_fini(&exec);
put_gobj_write:
--
2.49.0
next prev parent reply other threads:[~2026-04-27 8:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-27 8:34 [PATCH v2 01/11] drm/amdgpu/sdma: add SDMA usermode-queue doorbell pool infra Jesse Zhang
2026-04-27 8:34 ` [PATCH v2 02/11] drm/amdgpu/userq: route SDMA UMQ doorbells through the kernel pool Jesse Zhang
2026-04-27 8:34 ` [PATCH v2 03/11] drm/amdgpu/gem: only enforce amdgpu_bo access checks on amdgpu_bo objects Jesse Zhang
2026-04-27 8:39 ` Christian König
2026-04-27 8:34 ` [PATCH v2 04/11] drm/amdgpu/sdma7: register SDMA UMQ doorbell pool Jesse Zhang
2026-04-27 8:34 ` [PATCH v2 05/11] drm/amdgpu/sdma6: " Jesse Zhang
2026-04-27 8:34 ` [PATCH v2 06/11] drm/amdgpu: add AMDGPU_INFO_USERQ_DOORBELL ioctl Jesse Zhang
2026-04-27 8:34 ` [PATCH v2 07/11] drm/amdgpu/mes: add NOTIFY_WORK_ON_UNMAPPED_QUEUE op + ADD_QUEUE fields Jesse Zhang
2026-04-27 8:34 ` [PATCH v2 08/11] drm/amdgpu/mes11: plumb unmap_flag_addr + NOTIFY_WORK_ON_UNMAPPED_QUEUE Jesse Zhang
2026-04-27 8:34 ` [PATCH v2 09/11] drm/amdgpu/mes12: plumb is_user_mode_submission, unmap_flag_addr, NOTIFY Jesse Zhang
2026-04-27 8:34 ` [PATCH v2 10/11] drm/amdgpu/mes_userqueue: mark SDMA UMQs as user-mode submission Jesse Zhang
2026-04-27 8:34 ` Jesse Zhang [this message]
2026-04-27 8:42 ` [PATCH v2 01/11] drm/amdgpu/sdma: add SDMA usermode-queue doorbell pool infra Christian König
2026-04-28 9:39 ` Zhang, Jesse(Jie)
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=20260427083543.1328533-11-Jesse.Zhang@amd.com \
--to=jesse.zhang@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
/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