High priority usermode contexts
Subsystems (3)
PATCH v2 1/1 High priority usermode contexts
This patch series provides the initial APIs for high priority contexts.
The current implementation is based on top of the SW scheduler, there are no HW priorities set yet.
This doesn't provide the quality of service we need for VR. Further changes to enable HW priorities will be required.
For some performance data collected with multiple apps see:
https://lists.freedesktop.org/archives/amd-gfx/2016-December/004257.html
Test apps available here:
https://github.com/lostgoat/Vulkan
Related libdrm/radv patches to follow
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1483494477-12758-1-git-send-email-andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 1/1 drm/amdgpu: add flag for high priority contexts v2
Add a new context creation parameter to express a global context priority.
Contexts allocated with AMDGPU_CTX_PRIORITY_HIGH will receive higher priority to scheduler their work than AMDGPU_CTX_PRIORITY_NORMAL (default) contexts.
v2: Instead of using flags, repurpose __pad
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 37 +++++++++++++++++++++++---- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 1 + include/uapi/drm/amdgpu_drm.h | 6 ++++- 3 files changed, 38 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +32 -5
@@ -25,10 +25,34 @@#include <drm/drmP.h> #include "amdgpu.h" -static int amdgpu_ctx_init (struct amdgpu_device *adev,struct amdgpu_ctx *ctx) +static enum amd_sched_priority amdgpu_to_sched_priority (int amdgpu_priority) +{ +switch (amdgpu_priority) { +case AMDGPU_CTX_PRIORITY_HIGH : +return AMD_SCHED_PRIORITY_HIGH ; +case AMDGPU_CTX_PRIORITY_NORMAL : +return AMD_SCHED_PRIORITY_NORMAL ; +default : +WARN (1 ,"Invalid context priority %d\n" , amdgpu_priority); +return AMD_SCHED_PRIORITY_NORMAL ; + } +} + +static int amdgpu_ctx_init (struct amdgpu_device *adev, +uint32_t priority, +struct amdgpu_ctx *ctx) {unsigned i, j;int r; +enum amd_sched_priority sched_priority; + + sched_priority =amdgpu_to_sched_priority (priority); + +if (sched_priority <0 || sched_priority >=AMD_SCHED_MAX_PRIORITY ) +return -EINVAL ; + +if (sched_priority ==AMD_SCHED_PRIORITY_HIGH && !capable (CAP_SYS_ADMIN )) +return -EACCES ;memset (ctx,0 ,sizeof (*ctx)); ctx->adev = adev;
@@ -51,7 +75,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev, struct amdgpu_ctx *ctx)struct amdgpu_ring *ring = adev->rings[i];struct amd_sched_rq *rq; - rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_NORMAL ]; + rq = &ring->sched.sched_rq[sched_priority]; r =amd_sched_entity_init (&ring->sched, &ctx->rings[i].entity, rq, amdgpu_sched_jobs);if (r)
@@ -90,6 +114,7 @@ static void amdgpu_ctx_fini(struct amdgpu_ctx *ctx)static int amdgpu_ctx_alloc (struct amdgpu_device *adev,struct amdgpu_fpriv *fpriv, +uint32_t priority,uint32_t *id) {struct amdgpu_ctx_mgr *mgr = &fpriv->ctx_mgr;
@@ -107,8 +132,9 @@ static int amdgpu_ctx_alloc(struct amdgpu_device *adev,kfree (ctx);return r; } + *id = (uint32_t )r; - r =amdgpu_ctx_init (adev, ctx); + r =amdgpu_ctx_init (adev, priority, ctx);if (r) {idr_remove (&mgr->ctx_handles, *id); *id =0 ;
@@ -186,7 +212,7 @@ int amdgpu_ctx_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) {int r; -uint32_t id; +uint32_t id, priority;union drm_amdgpu_ctx *args = data;struct amdgpu_device *adev = dev->dev_private;
@@ -194,10 +220,11 @@ int amdgpu_ctx_ioctl(struct drm_device *dev, void *data, r =0 ; id = args->in.ctx_id; + priority = args->in.priority;switch (args->in.op) {case AMDGPU_CTX_OP_ALLOC_CTX : - r =amdgpu_ctx_alloc (adev, fpriv, &id); + r =amdgpu_ctx_alloc (adev, fpriv, priority, &id); args->out.alloc.ctx_id = id;break ;case AMDGPU_CTX_OP_FREE_CTX :
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +1 -0
@@ -108,6 +108,7 @@ struct amd_sched_backend_ops {enum amd_sched_priority {AMD_SCHED_PRIORITY_KERNEL =0 , +AMD_SCHED_PRIORITY_HIGH ,AMD_SCHED_PRIORITY_NORMAL ,AMD_SCHED_MAX_PRIORITY };
include/uapi/drm/amdgpu_drm.h +5 -1
@@ -160,13 +160,17 @@ union drm_amdgpu_bo_list {/* unknown cause */ #define AMDGPU_CTX_UNKNOWN_RESET 3 +/* Context priority level */ +#define AMDGPU_CTX_PRIORITY_HIGH 0 +#define AMDGPU_CTX_PRIORITY_NORMAL 1 +struct drm_amdgpu_ctx_in {/** AMDGPU_CTX_OP_* */ __u32 op;/** For future use, no flags defined so far */ __u32 flags;__u32 ctx_id; -__u32 _pad; +__u32 priority; };union drm_amdgpu_ctx_out {
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 7 lines · Andres Rodriguez
This patch series provides the initial APIs for high priority contexts.
The current implementation is based on top of the SW scheduler, there are no HW priorities set yet.
This doesn't provide the quality of service we need for VR. Further changes to enable HW priorities will be required.
More importantly, this only affects relative priority between graphics SW queues, or between compute SW queues running on the same compute ring. It has no influence on relative priority between compute queues and graphics queues or compute queues running on different compute rings (HW queues).
Regards,
Felix
Quoted 7 lines
For some performance data collected with multiple apps see:
https://lists.freedesktop.org/archives/amd-gfx/2016-December/004257.htmlTest apps available here:
https://github.com/lostgoat/Vulkan
Quoted 6 lines
Related libdrm/radv patches to follow
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx