anv/trtt: use 'queue' from anv_sparse_submission in the backend

Don't pass it as a parameter when it's also part of a struct. Have to
touch 9 files just for that...

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25512>
This commit is contained in:
Paulo Zanoni 2023-10-24 12:20:37 -07:00 committed by Marge Bot
parent f6d28bec6d
commit cbf09b4254
9 changed files with 13 additions and 20 deletions

View file

@ -1719,10 +1719,10 @@ anv_queue_submit_simple_batch(struct anv_queue *queue,
}
VkResult
anv_queue_submit_trtt_batch(struct anv_queue *queue,
struct anv_sparse_submission *submit,
anv_queue_submit_trtt_batch(struct anv_sparse_submission *submit,
struct anv_batch *batch)
{
struct anv_queue *queue = submit->queue;
struct anv_device *device = queue->device;
VkResult result = VK_SUCCESS;
@ -1744,7 +1744,7 @@ anv_queue_submit_trtt_batch(struct anv_queue *queue,
batch_bo->offset, false);
}
result = device->kmd_backend->execute_trtt_batch(queue, submit, batch_bo,
result = device->kmd_backend->execute_trtt_batch(submit, batch_bo,
batch_size);
anv_bo_pool_free(&device->batch_bo_pool, batch_bo);

View file

@ -66,8 +66,7 @@ stub_execute_simple_batch(struct anv_queue *queue, struct anv_bo *batch_bo,
}
static VkResult
stub_execute_trtt_batch(struct anv_queue *queue,
struct anv_sparse_submission *submit,
stub_execute_trtt_batch(struct anv_sparse_submission *submit,
struct anv_bo *batch_bo, uint32_t batch_size)
{
return VK_ERROR_UNKNOWN;

View file

@ -78,8 +78,7 @@ struct anv_kmd_backend {
struct anv_bo *batch_bo,
uint32_t batch_bo_size,
bool is_companion_rcs_batch);
VkResult (*execute_trtt_batch)(struct anv_queue *queue,
struct anv_sparse_submission *submit,
VkResult (*execute_trtt_batch)(struct anv_sparse_submission *submit,
struct anv_bo *batch_bo,
uint32_t batch_size);
VkResult (*queue_exec_locked)(struct anv_queue *queue,

View file

@ -1941,8 +1941,7 @@ VkResult anv_queue_submit(struct vk_queue *queue,
VkResult anv_queue_submit_simple_batch(struct anv_queue *queue,
struct anv_batch *batch,
bool is_companion_rcs_batch);
VkResult anv_queue_submit_trtt_batch(struct anv_queue *queue,
struct anv_sparse_submission *submit,
VkResult anv_queue_submit_trtt_batch(struct anv_sparse_submission *submit,
struct anv_batch *batch);
void anv_queue_trace(struct anv_queue *queue, const char *label,

View file

@ -8431,7 +8431,6 @@ VkResult
genX(write_trtt_entries)(struct anv_trtt_submission *submit)
{
#if GFX_VER >= 12
struct anv_queue *queue = submit->sparse->queue;
size_t batch_size = submit->l3l2_binds_len * 20 +
submit->l1_binds_len * 16 + 8;
STACK_ARRAY(uint32_t, cmds, batch_size);
@ -8530,8 +8529,7 @@ genX(write_trtt_entries)(struct anv_trtt_submission *submit)
assert(batch.next <= batch.end);
VkResult result = anv_queue_submit_trtt_batch(queue, submit->sparse,
&batch);
VkResult result = anv_queue_submit_trtt_batch(submit->sparse, &batch);
STACK_ARRAY_FINISH(cmds);
return result;

View file

@ -985,10 +985,10 @@ fail:
}
VkResult
i915_execute_trtt_batch(struct anv_queue *queue,
struct anv_sparse_submission *submit,
i915_execute_trtt_batch(struct anv_sparse_submission *submit,
struct anv_bo *batch_bo, uint32_t batch_size)
{
struct anv_queue *queue = submit->queue;
struct anv_device *device = queue->device;
struct anv_trtt *trtt = &device->trtt;
struct anv_execbuf execbuf = {

View file

@ -45,8 +45,7 @@ i915_execute_simple_batch(struct anv_queue *queue, struct anv_bo *batch_bo,
uint32_t batch_bo_size, bool is_companion_rcs_batch);
VkResult
i915_execute_trtt_batch(struct anv_queue *queue,
struct anv_sparse_submission *submit,
i915_execute_trtt_batch(struct anv_sparse_submission *submit,
struct anv_bo *batch_bo, uint32_t batch_size);
VkResult

View file

@ -179,10 +179,10 @@ xe_exec_print_debug(struct anv_queue *queue, uint32_t cmd_buffer_count,
}
VkResult
xe_execute_trtt_batch(struct anv_queue *queue,
struct anv_sparse_submission *submit,
xe_execute_trtt_batch(struct anv_sparse_submission *submit,
struct anv_bo *batch_bo, uint32_t batch_size)
{
struct anv_queue *queue = submit->queue;
struct anv_device *device = queue->device;
VkResult result = VK_SUCCESS;

View file

@ -40,8 +40,7 @@ VkResult
xe_execute_simple_batch(struct anv_queue *queue, struct anv_bo *batch_bo,
uint32_t batch_bo_size, bool is_companion_rcs_batch);
VkResult
xe_execute_trtt_batch(struct anv_queue *queue,
struct anv_sparse_submission *submit,
xe_execute_trtt_batch(struct anv_sparse_submission *submit,
struct anv_bo *batch_bo, uint32_t batch_size);
VkResult