From: "Jesse.zhang@amd.com" <jesse.zhang@amd.com>
To: <igt-dev@lists.freedesktop.org>
Cc: Vitaly Prosyak <vitaly.prosyak@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
Christian Koenig <christian.koenig@amd.com>, <sukhatri@amd.com>,
"Jesse.zhang@amd.com" <jesse.zhang@amd.com>,
"Jesse . Zhang" <Jesse.zhang@amd.com>
Subject: [PATCH i-g-t v2 2/2] lib/amdgpu: Implement priority and secure flags for user queues
Date: Thu, 17 Apr 2025 16:52:47 +0800 [thread overview]
Message-ID: <20250417085247.592557-2-jesse.zhang@amd.com> (raw)
In-Reply-To: <20250417085247.592557-1-jesse.zhang@amd.com>
This patch adds support for queue priority levels and secure queue
creation flags in the user queue interface. The changes include:
1. Extended the amdgpu_ring_context struct to store queue priority
2. Modified amdgpu_user_queue_create() to:
- Parse and pass through priority flags from context
- Handle secure queue flag
- Include flags in queue creation IOCTL calls
The priority levels allow workloads to specify different scheduling
priorities, with HIGH priority restricted to admin-only use. The secure
flag enables creation of queues that can access protected content.
This matches the corresponding libdrm changes in commit fdf384d4b546
("amdgpu: add priority and secure flags for user queues").
Signed-off-by: Jesse.Zhang <Jesse.zhang@amd.com>
---
lib/amdgpu/amd_ip_blocks.h | 1 +
lib/amdgpu/amd_user_queue.c | 15 +++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/lib/amdgpu/amd_ip_blocks.h b/lib/amdgpu/amd_ip_blocks.h
index 231098eb8..7d48f9107 100644
--- a/lib/amdgpu/amd_ip_blocks.h
+++ b/lib/amdgpu/amd_ip_blocks.h
@@ -118,6 +118,7 @@ struct amdgpu_ring_context {
uint32_t *pm4; /* data of the packet */
uint32_t pm4_size; /* max allocated packet size */
bool secure; /* secure or not */
+ uint32_t priority; /* user queue priority */
uint64_t bo_mc; /* GPU address of first buffer */
uint64_t bo_mc2; /* GPU address for p4 packet */
diff --git a/lib/amdgpu/amd_user_queue.c b/lib/amdgpu/amd_user_queue.c
index 0cdd0c4f9..b396d0307 100644
--- a/lib/amdgpu/amd_user_queue.c
+++ b/lib/amdgpu/amd_user_queue.c
@@ -270,7 +270,7 @@ void amdgpu_user_queue_create(amdgpu_device_handle device_handle, struct amdgpu_
unsigned int type)
{
int r;
- uint64_t gtt_flags = 0;
+ uint64_t gtt_flags = 0, queue_flags = 0;
struct drm_amdgpu_userq_mqd_gfx11 gfx_mqd;
struct drm_amdgpu_userq_mqd_sdma_gfx11 sdma_mqd;
struct drm_amdgpu_userq_mqd_compute_gfx11 compute_mqd;
@@ -283,6 +283,13 @@ void amdgpu_user_queue_create(amdgpu_device_handle device_handle, struct amdgpu_
if (ctxt->secure)
gtt_flags |= AMDGPU_GEM_CREATE_ENCRYPTED;
+
+ if (ctxt->secure)
+ queue_flags |= AMDGPU_USERQ_CREATE_FLAGS_QUEUE_SECURE;
+
+ if (ctxt->priority)
+ queue_flags |= ctxt->priority & AMDGPU_USERQ_CREATE_FLAGS_QUEUE_PRIORITY_MASK;
+
r = amdgpu_query_uq_fw_area_info(device_handle, AMD_IP_GFX, 0, &ctxt->info);
igt_assert_eq(r, 0);
@@ -404,7 +411,7 @@ void amdgpu_user_queue_create(amdgpu_device_handle device_handle, struct amdgpu_
ctxt->db_handle, DOORBELL_INDEX,
ctxt->queue.mc_addr, USERMODE_QUEUE_SIZE,
ctxt->wptr.mc_addr, ctxt->rptr.mc_addr,
- mqd, &ctxt->queue_id);
+ mqd, queue_flags, &ctxt->queue_id);
igt_assert_eq(r, 0);
break;
@@ -413,7 +420,7 @@ void amdgpu_user_queue_create(amdgpu_device_handle device_handle, struct amdgpu_
ctxt->db_handle, DOORBELL_INDEX,
ctxt->queue.mc_addr, USERMODE_QUEUE_SIZE,
ctxt->wptr.mc_addr, ctxt->rptr.mc_addr,
- mqd, &ctxt->queue_id);
+ mqd, queue_flags, &ctxt->queue_id);
igt_assert_eq(r, 0);
break;
@@ -422,7 +429,7 @@ void amdgpu_user_queue_create(amdgpu_device_handle device_handle, struct amdgpu_
ctxt->db_handle, DOORBELL_INDEX,
ctxt->queue.mc_addr, USERMODE_QUEUE_SIZE,
ctxt->wptr.mc_addr, ctxt->rptr.mc_addr,
- mqd, &ctxt->queue_id);
+ mqd, queue_flags, &ctxt->queue_id);
igt_assert_eq(r, 0);
break;
--
2.25.1
next prev parent reply other threads:[~2025-04-17 8:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-17 8:52 [PATCH i-g-t v2 1/2] drm-uapi/amdgpu: Add queue priority and secure flags definitions Jesse.zhang@amd.com
2025-04-17 8:52 ` Jesse.zhang@amd.com [this message]
2025-04-17 12:44 ` [PATCH i-g-t v2 2/2] lib/amdgpu: Implement priority and secure flags for user queues Khatri, Sunil
2025-04-17 12:42 ` [PATCH i-g-t v2 1/2] drm-uapi/amdgpu: Add queue priority and secure flags definitions Khatri, Sunil
2025-04-17 13:21 ` ✗ Xe.CI.BAT: failure for series starting with [i-g-t,v2,1/2] " Patchwork
2025-04-17 13:41 ` ✓ i915.CI.BAT: success " Patchwork
2025-04-17 16:37 ` [PATCH i-g-t v2 1/2] " Kamil Konieczny
2025-04-22 8:21 ` Christian König
2025-04-18 1:12 ` ✗ i915.CI.Full: failure for series starting with [i-g-t,v2,1/2] " Patchwork
2025-04-18 3:41 ` ✗ Xe.CI.Full: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2025-04-18 2:29 [PATCH i-g-t v2 1/2] " Jesse.zhang@amd.com
2025-04-18 2:29 ` [PATCH i-g-t v2 2/2] lib/amdgpu: Implement priority and secure flags for user queues Jesse.zhang@amd.com
2025-04-18 5:25 ` Khatri, Sunil
2025-04-18 13:13 ` Kamil Konieczny
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=20250417085247.592557-2-jesse.zhang@amd.com \
--to=jesse.zhang@amd.com \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=sukhatri@amd.com \
--cc=vitaly.prosyak@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