fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 13:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: Add support for batch buffers in anv_slab_bo in i915

Browse source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33558>
This commit is contained in:
José Roberto de Souza 2025-03-07 09:34:40 -08:00 • committed by Marge Bot
parent 39bb51ab27
commit 6f7a32ec92
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/intel/vulkan/anv_slab_bo.c
View file

@ -49,10 +49,8 @@ anv_bo_alloc_flags_to_slab_heap(struct anv_device *device,
ANV_BO_ALLOC_IMPLICIT_WRITE); ANV_BO_ALLOC_IMPLICIT_WRITE);
} }
/* TODO: add i915 support */ if (alloc_flags == ANV_BO_ALLOC_BATCH_BUFFER_FLAGS ||
if ((alloc_flags == ANV_BO_ALLOC_BATCH_BUFFER_FLAGS || alloc_flags == ANV_BO_ALLOC_BATCH_BUFFER_INTERNAL_FLAGS)
alloc_flags == ANV_BO_ALLOC_BATCH_BUFFER_INTERNAL_FLAGS) &&
(device->info->kmd_type == INTEL_KMD_TYPE_XE))
return ANV_BO_SLAB_HEAP_CACHED_COHERENT_CAPTURE; return ANV_BO_SLAB_HEAP_CACHED_COHERENT_CAPTURE;
if (alloc_flags == ANV_BO_ALLOC_DYNAMIC_VISIBLE_POOL_FLAGS) if (alloc_flags == ANV_BO_ALLOC_DYNAMIC_VISIBLE_POOL_FLAGS)

41
src/intel/vulkan/i915/anv_batch_chain.c
View file

@ -362,6 +362,14 @@ out:
return result; return result;
} }
static uint32_t
calc_batch_start_offset(struct anv_bo *bo)
{
struct anv_bo *real = anv_bo_get_real(bo);
return bo->offset - real->offset;
}
static VkResult static VkResult
setup_execbuf_for_cmd_buffers(struct anv_execbuf *execbuf, setup_execbuf_for_cmd_buffers(struct anv_execbuf *execbuf,
struct anv_queue *queue, struct anv_queue *queue,
@ -464,28 +472,29 @@ setup_execbuf_for_cmd_buffers(struct anv_execbuf *execbuf,
} }
struct list_head *batch_bo = &cmd_buffers[0]->batch_bos; struct list_head *batch_bo = &cmd_buffers[0]->batch_bos;
struct anv_batch_bo *first_batch_bo = struct anv_bo *first_batch_bo =
list_first_entry(batch_bo, struct anv_batch_bo, link); list_first_entry(batch_bo, struct anv_batch_bo, link)->bo;
struct anv_bo *first_batch_bo_real = anv_bo_get_real(first_batch_bo);
/* The kernel requires that the last entry in the validation list be the /* The kernel requires that the last entry in the validation list be the
* batch buffer to execute. We can simply swap the element * batch buffer to execute. We can simply swap the element
* corresponding to the first batch_bo in the chain with the last * corresponding to the first batch_bo in the chain with the last
* element in the list. * element in the list.
*/ */
if (first_batch_bo->bo->exec_obj_index != execbuf->bo_count - 1) { if (first_batch_bo_real->exec_obj_index != execbuf->bo_count - 1) {
uint32_t idx = first_batch_bo->bo->exec_obj_index; uint32_t idx = first_batch_bo_real->exec_obj_index;
uint32_t last_idx = execbuf->bo_count - 1; uint32_t last_idx = execbuf->bo_count - 1;
struct drm_i915_gem_exec_object2 tmp_obj = execbuf->objects[idx]; struct drm_i915_gem_exec_object2 tmp_obj = execbuf->objects[idx];
assert(execbuf->bos[idx] == first_batch_bo->bo); assert(execbuf->bos[idx] == first_batch_bo_real);
execbuf->objects[idx] = execbuf->objects[last_idx]; execbuf->objects[idx] = execbuf->objects[last_idx];
execbuf->bos[idx] = execbuf->bos[last_idx]; execbuf->bos[idx] = execbuf->bos[last_idx];
execbuf->bos[idx]->exec_obj_index = idx; execbuf->bos[idx]->exec_obj_index = idx;
execbuf->objects[last_idx] = tmp_obj; execbuf->objects[last_idx] = tmp_obj;
execbuf->bos[last_idx] = first_batch_bo->bo; execbuf->bos[last_idx] = first_batch_bo_real;
first_batch_bo->bo->exec_obj_index = last_idx; first_batch_bo_real->exec_obj_index = last_idx;
} }
#ifdef SUPPORT_INTEL_INTEGRATED_GPUS #ifdef SUPPORT_INTEL_INTEGRATED_GPUS
@ -503,7 +512,7 @@ setup_execbuf_for_cmd_buffers(struct anv_execbuf *execbuf,
execbuf->execbuf = (struct drm_i915_gem_execbuffer2) { execbuf->execbuf = (struct drm_i915_gem_execbuffer2) {
.buffers_ptr = (uintptr_t) execbuf->objects, .buffers_ptr = (uintptr_t) execbuf->objects,
.buffer_count = execbuf->bo_count, .buffer_count = execbuf->bo_count,
.batch_start_offset = 0, .batch_start_offset = calc_batch_start_offset(first_batch_bo),
.batch_len = 0, .batch_len = 0,
.cliprects_ptr = 0, .cliprects_ptr = 0,
.num_cliprects = 0, .num_cliprects = 0,
@ -536,7 +545,7 @@ setup_empty_execbuf(struct anv_execbuf *execbuf, struct anv_queue *queue)
execbuf->execbuf = (struct drm_i915_gem_execbuffer2) { execbuf->execbuf = (struct drm_i915_gem_execbuffer2) {
.buffers_ptr = (uintptr_t) execbuf->objects, .buffers_ptr = (uintptr_t) execbuf->objects,
.buffer_count = execbuf->bo_count, .buffer_count = execbuf->bo_count,
.batch_start_offset = 0, .batch_start_offset = calc_batch_start_offset(device->trivial_batch_bo),
.batch_len = 8, /* GFX7_MI_BATCH_BUFFER_END and NOOP */ .batch_len = 8, /* GFX7_MI_BATCH_BUFFER_END and NOOP */
.flags = I915_EXEC_HANDLE_LUT | exec_flags | I915_EXEC_NO_RELOC, .flags = I915_EXEC_HANDLE_LUT | exec_flags | I915_EXEC_NO_RELOC,
.rsvd1 = context_id, .rsvd1 = context_id,
@ -633,20 +642,21 @@ setup_async_execbuf(struct anv_execbuf *execbuf,
struct anv_bo *batch_bo = struct anv_bo *batch_bo =
*util_dynarray_element(&submit->batch_bos, struct anv_bo *, 0); *util_dynarray_element(&submit->batch_bos, struct anv_bo *, 0);
if (batch_bo->exec_obj_index != execbuf->bo_count - 1) { struct anv_bo *batch_bo_real = anv_bo_get_real(batch_bo);
uint32_t idx = batch_bo->exec_obj_index; if (batch_bo_real->exec_obj_index != execbuf->bo_count - 1) {
uint32_t idx = batch_bo_real->exec_obj_index;
uint32_t last_idx = execbuf->bo_count - 1; uint32_t last_idx = execbuf->bo_count - 1;
struct drm_i915_gem_exec_object2 tmp_obj = execbuf->objects[idx]; struct drm_i915_gem_exec_object2 tmp_obj = execbuf->objects[idx];
assert(execbuf->bos[idx] == batch_bo); assert(execbuf->bos[idx] == batch_bo_real);
execbuf->objects[idx] = execbuf->objects[last_idx]; execbuf->objects[idx] = execbuf->objects[last_idx];
execbuf->bos[idx] = execbuf->bos[last_idx]; execbuf->bos[idx] = execbuf->bos[last_idx];
execbuf->bos[idx]->exec_obj_index = idx; execbuf->bos[idx]->exec_obj_index = idx;
execbuf->objects[last_idx] = tmp_obj; execbuf->objects[last_idx] = tmp_obj;
execbuf->bos[last_idx] = batch_bo; execbuf->bos[last_idx] = batch_bo_real;
batch_bo->exec_obj_index = last_idx; batch_bo_real->exec_obj_index = last_idx;
} }
uint64_t exec_flags = 0; uint64_t exec_flags = 0;
@ -657,7 +667,7 @@ setup_async_execbuf(struct anv_execbuf *execbuf,
execbuf->execbuf = (struct drm_i915_gem_execbuffer2) { execbuf->execbuf = (struct drm_i915_gem_execbuffer2) {
.buffers_ptr = (uintptr_t) execbuf->objects, .buffers_ptr = (uintptr_t) execbuf->objects,
.buffer_count = execbuf->bo_count, .buffer_count = execbuf->bo_count,
.batch_start_offset = 0, .batch_start_offset = calc_batch_start_offset(batch_bo),
.flags = I915_EXEC_NO_RELOC | .flags = I915_EXEC_NO_RELOC |
I915_EXEC_HANDLE_LUT | I915_EXEC_HANDLE_LUT |
exec_flags, exec_flags,
@ -961,6 +971,7 @@ i915_queue_exec_locked(struct anv_queue *queue,
.flags = I915_EXEC_HANDLE_LUT | exec_flags, .flags = I915_EXEC_HANDLE_LUT | exec_flags,
.rsvd1 = context_id, .rsvd1 = context_id,
}; };
query_pass_execbuf.batch_start_offset += calc_batch_start_offset(pass_batch_bo);
int ret = queue->device->info->no_hw ? 0 : int ret = queue->device->info->no_hw ? 0 :
anv_gem_execbuffer(queue->device, &query_pass_execbuf); anv_gem_execbuffer(queue->device, &query_pass_execbuf);