<html> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> </head> <body text="#000000" bgcolor="#FFFFFF"> <div class="moz-cite-prefix">On 2017-10-31 11:50 AM, Samuel Pitoiset wrote: </div> <blockquote cite="mid:078f3ca7-e108-6ce6-4e07-65d8f569eb45@gmail.com" type="cite"> On 10/31/2017 04:40 PM, Andrey Grodzovsky wrote: <blockquote type="cite">Signed-off-by: Andrey Grodzovsky <a class="moz-txt-link-rfc2396E" href="mailto:andrey.grodzovsky@amd.com"><andrey.grodzovsky@amd.com></a> --- Â configure.acÂ Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â | 2 +- Â src/gallium/drivers/radeon/r600_pipe_common.c | 1 + Â src/gallium/drivers/radeon/r600_pipe_common.h | 1 + Â src/gallium/winsys/amdgpu/drm/amdgpu_cs.cÂ Â Â Â | 8 ++++++++ Â src/gallium/winsys/amdgpu/drm/amdgpu_cs.hÂ Â Â Â | 3 +++ Â src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 1 + Â src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h | 1 + Â 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9aa02f5..efc653a 100644 --- a/configure.ac +++ b/configure.ac @@ -74,7 +74,7 @@ AC_SUBST([OPENCL_VERSION]) Â # in the first entry. Â LIBDRM_REQUIRED=2.4.75 Â LIBDRM_RADEON_REQUIRED=2.4.71 -LIBDRM_AMDGPU_REQUIRED=2.4.85 +LIBDRM_AMDGPU_REQUIRED=2.4.86 Â LIBDRM_INTEL_REQUIRED=2.4.75 Â LIBDRM_NVVIEUX_REQUIRED=2.4.66 Â LIBDRM_NOUVEAU_REQUIRED=2.4.66 diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index b77d859..3364dac 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -851,6 +851,7 @@ static const struct debug_named_value common_debug_options[] = { Â Â Â Â Â { "dpbb", DBG(DPBB), "Enable DPBB." }, Â Â Â Â Â { "dfsm", DBG(DFSM), "Enable DFSM." }, Â Â Â Â Â { "nooutoforder", DBG(NO_OUT_OF_ORDER), "Disable out-of-order rasterization" }, +Â Â Â { "reserve_vmid", DBG(RESERVE_VMID), "Force VMID resrvation per context." }, </blockquote> "reservation". Can you also explain a bit what that stuff is? :) </blockquote> It allows to have fixed VMID assigned to a process, otherwise each time a command is processed the next available VMID is assigned according to a policy in KMD (amdgpu_vm_grab_id). Thanks, Andrey <span style="color: rgb(176, 204, 232); font-family: "Source Sans Pro", sans-serif; font-size: 15px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: 0.2px; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(23, 51, 79); text-decoration-style: initial; text-decoration-color: initial; display: inline !important; float: none;"> <blockquote cite="mid:078f3ca7-e108-6ce6-4e07-65d8f569eb45@gmail.com" type="cite"> Thanks! <blockquote type="cite">Â Â Â Â Â Â DEBUG_NAMED_VALUE_END /* must be last */ Â }; diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index a7c91cb..94c8d4f 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -107,6 +107,7 @@ enum { Â Â Â Â Â DBG_NO_DISCARD_RANGE, Â Â Â Â Â DBG_NO_WC, Â Â Â Â Â DBG_CHECK_VM, +Â Â Â DBG_RESERVE_VMID, Â Â Â Â Â Â /* 3D engine options: */ Â Â Â Â Â DBG_SWITCH_ON_EOP, diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 8f43e93..1155492 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -256,6 +256,14 @@ static struct radeon_winsys_ctx *amdgpu_ctx_create(struct radeon_winsys *ws) Â Â Â Â Â Â Â goto error_create; Â Â Â Â } Â +Â Â if (ctx->ws->reserve_vmid) { +Â Â Â Â Â Â r = amdgpu_vm_reserve_vmid(ctx->ctx, 0); +Â Â Â Â Â Â if (r) { +Â Â Â Â Â Â Â fprintf(stderr, "amdgpu: amdgpu_cs_ctx_create failed. (%i)\n", r); +Â Â Â Â Â Â Â goto error_create; +Â Â Â Â Â Â } +Â Â } + Â Â Â Â alloc_buffer.alloc_size = ctx->ws->info.gart_page_size; Â Â Â Â alloc_buffer.phys_alignment = ctx->ws->info.gart_page_size; Â Â Â Â alloc_buffer.preferred_heap = AMDGPU_GEM_DOMAIN_GTT; diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h index 1c3d0f0..d023841 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h @@ -162,6 +162,9 @@ static inline bool amdgpu_fence_is_syncobj(struct amdgpu_fence *fence) Â static inline void amdgpu_ctx_unref(struct amdgpu_ctx *ctx) Â { Â Â Â Â if (p_atomic_dec_zero(&ctx->refcount)) { +Â Â Â Â Â if (ctx->ws->reserve_vmid) +Â Â Â Â Â Â Â Â amdgpu_vm_unreserve_vmid(ctx->ctx, 0); + Â Â Â Â Â Â Â amdgpu_cs_ctx_free(ctx->ctx); Â Â Â Â Â Â Â amdgpu_bo_free(ctx->user_fence_bo); Â Â Â Â Â Â Â FREE(ctx); diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index a210a27..b80a988 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -73,6 +73,7 @@ static bool do_winsys_init(struct amdgpu_winsys *ws, int fd) Â Â Â Â Â ws->check_vm = strstr(debug_get_option("R600_DEBUG", ""), "check_vm") != NULL; Â Â Â Â ws->debug_all_bos = debug_get_option_all_bos(); +Â Â ws->reserve_vmid = strstr(debug_get_option("R600_DEBUG", ""), "reserve_vmid") != NULL; Â Â Â Â Â return true; Â diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h index 8b62e2d..b4a3422 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h @@ -81,6 +81,7 @@ struct amdgpu_winsys { Â Â Â Â Â bool check_vm; Â Â Â Â bool debug_all_bos; +Â Â bool reserve_vmid; Â Â Â Â Â /* List of all allocated buffers */ Â Â Â Â mtx_t global_bo_list_lock; </blockquote> </blockquote> </body> </html>