OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: reuse setup_execbuf_fence_params for utrace submissions

Browse Source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28975>
This commit is contained in:
Lionel Landwerlin
2024-05-09 09:40:20 +03:00
committed by Marge Bot
parent 8c7e1052a3
commit dd19e4240e
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/intel/vulkan/i915/anv_batch_chain.c
View File

@@ -551,6 +551,23 @@ setup_empty_execbuf(struct anv_execbuf *execbuf, struct anv_queue *queue)
return VK_SUCCESS;
}
static void
setup_execbuf_fence_params(struct anv_execbuf *execbuf)
{
if (execbuf->syncobj_values) {
execbuf->timeline_fences.fence_count = execbuf->syncobj_count;
execbuf->timeline_fences.handles_ptr = (uintptr_t)execbuf->syncobjs;
execbuf->timeline_fences.values_ptr = (uintptr_t)execbuf->syncobj_values;
anv_execbuf_add_ext(execbuf,
DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES,
&execbuf->timeline_fences.base);
} else if (execbuf->syncobjs) {
execbuf->execbuf.flags |= I915_EXEC_FENCE_ARRAY;
execbuf->execbuf.num_cliprects = execbuf->syncobj_count;
execbuf->execbuf.cliprects_ptr = (uintptr_t)execbuf->syncobjs;
}
}
static VkResult
setup_utrace_execbuf(struct anv_execbuf *execbuf, struct anv_queue *queue,
struct anv_utrace_submit *submit)
@@ -615,14 +632,13 @@ setup_utrace_execbuf(struct anv_execbuf *execbuf, struct anv_queue *queue,
.batch_len = submit->batch.next - submit->batch.start,
.flags = I915_EXEC_NO_RELOC |
I915_EXEC_HANDLE_LUT |
I915_EXEC_FENCE_ARRAY |
exec_flags,
.rsvd1 = context_id,
.rsvd2 = 0,
.num_cliprects = execbuf->syncobj_count,
.cliprects_ptr = (uintptr_t)execbuf->syncobjs,
};
setup_execbuf_fence_params(execbuf);
return VK_SUCCESS;
}
@@ -698,23 +714,6 @@ anv_i915_debug_submit(const struct anv_execbuf *execbuf)
}
}
static void
setup_execbuf_fence_params(struct anv_execbuf *execbuf)
{
if (execbuf->syncobj_values) {
execbuf->timeline_fences.fence_count = execbuf->syncobj_count;
execbuf->timeline_fences.handles_ptr = (uintptr_t)execbuf->syncobjs;
execbuf->timeline_fences.values_ptr = (uintptr_t)execbuf->syncobj_values;
anv_execbuf_add_ext(execbuf,
DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES,
&execbuf->timeline_fences.base);
} else if (execbuf->syncobjs) {
execbuf->execbuf.flags |= I915_EXEC_FENCE_ARRAY;
execbuf->execbuf.num_cliprects = execbuf->syncobj_count;
execbuf->execbuf.cliprects_ptr = (uintptr_t)execbuf->syncobjs;
}
}
static VkResult
i915_companion_rcs_queue_exec_locked(struct anv_queue *queue,
struct anv_cmd_buffer *companion_rcs_cmd_buffer,