Add a new context creation function that allows specifying the context priority. A high priority context has the potential of starving lower priority contexts. The current kernel driver implementation only allows only the root user to allocate high priority contexts. --- amdgpu/amdgpu.h | 13 +++++++++++++ amdgpu/amdgpu_cs.c | 13 +++++++++++-- configure.ac | 2 +- include/drm/amdgpu_drm.h | 3 ++- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h index 7b26a04..c224ddd 100644 --- a/amdgpu/amdgpu.h +++ b/amdgpu/amdgpu.h @@ -795,6 +795,7 @@ int amdgpu_bo_list_update(amdgpu_bo_list_handle handle, * * * \param dev - \c [in] Device handle. See #amdgpu_device_initialize() + * \param flags - \c [in] Context creation flags. See AMDGPU_CTX_FLAG_* * \param context - \c [out] GPU Context handle * * \return 0 on success\n @@ -803,6 +804,18 @@ int amdgpu_bo_list_update(amdgpu_bo_list_handle handle, * \sa amdgpu_cs_ctx_free() * */ +int amdgpu_cs_ctx_create2(amdgpu_device_handle dev, + uint64_t flags, + amdgpu_context_handle *context); +/** + * Create GPU execution Context + * + * Refer to amdgpu_cs_ctx_create2 for full documentation. This call + * is missing the flag parameter. + * + * \sa amdgpu_cs_ctx_create2() + * +*/ int amdgpu_cs_ctx_create(amdgpu_device_handle dev, amdgpu_context_handle *context); diff --git a/amdgpu/amdgpu_cs.c b/amdgpu/amdgpu_cs.c index fb5b3a8..7694f5a 100644 --- a/amdgpu/amdgpu_cs.c +++ b/amdgpu/amdgpu_cs.c @@ -47,12 +47,13 @@ static int amdgpu_cs_reset_sem(amdgpu_semaphore_handle sem); * Create command submission context * * \param dev - \c [in] amdgpu device handle + * \param flags - \c [in] Context creation flags. See AMDGPU_CTX_FLAG_* * \param context - \c [out] amdgpu context handle * * \return 0 on success otherwise POSIX Error code */ -int amdgpu_cs_ctx_create(amdgpu_device_handle dev, - amdgpu_context_handle *context) +int amdgpu_cs_ctx_create2(amdgpu_device_handle dev, uint64_t flags, + amdgpu_context_handle *context) { struct amdgpu_context *gpu_context; union drm_amdgpu_ctx args; @@ -77,6 +78,8 @@ int amdgpu_cs_ctx_create(amdgpu_device_handle dev, /* Create the context */ memset(&args, 0, sizeof(args)); args.in.op = AMDGPU_CTX_OP_ALLOC_CTX; + args.in.flags = flags; + r = drmCommandWriteRead(dev->fd, DRM_AMDGPU_CTX, &args, sizeof(args)); if (r) goto error; @@ -96,6 +99,12 @@ error: return r; } +int amdgpu_cs_ctx_create(amdgpu_device_handle dev, + amdgpu_context_handle *context) +{ + return amdgpu_cs_ctx_create2(dev, 0, context); +} + /** * Release command submission context * diff --git a/configure.ac b/configure.ac index e0597c3..682171b 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], - [2.4.74], + [2.4.75], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], [libdrm]) diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h index d8f2497..b4838b4 100644 --- a/include/drm/amdgpu_drm.h +++ b/include/drm/amdgpu_drm.h @@ -154,10 +154,11 @@ union drm_amdgpu_bo_list { /* unknown cause */ #define AMDGPU_CTX_UNKNOWN_RESET 3 +#define AMDGPU_CTX_FLAG_HIGHPRIORITY (1 << 0) struct drm_amdgpu_ctx_in { /** AMDGPU_CTX_OP_* */ uint32_t op; - /** For future use, no flags defined so far */ + /** AMDGPU_CTX_FLAG_* */ uint32_t flags; uint32_t ctx_id; uint32_t _pad; -- 2.9.3