Module: Mesa Branch: main Commit: cbf09b4254d6143f60e697b2a374b9e6428a6447 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbf09b4254d6143f60e697b2a374b9e6428a6447
Author: Paulo Zanoni <[email protected]> Date: Tue Oct 24 12:20:37 2023 -0700 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 <[email protected]> Signed-off-by: Paulo Zanoni <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25512> --- src/intel/vulkan/anv_batch_chain.c | 6 +++--- src/intel/vulkan/anv_gem_stubs.c | 3 +-- src/intel/vulkan/anv_kmd_backend.h | 3 +-- src/intel/vulkan/anv_private.h | 3 +-- src/intel/vulkan/genX_cmd_buffer.c | 4 +--- src/intel/vulkan/i915/anv_batch_chain.c | 4 ++-- src/intel/vulkan/i915/anv_batch_chain.h | 3 +-- src/intel/vulkan/xe/anv_batch_chain.c | 4 ++-- src/intel/vulkan/xe/anv_batch_chain.h | 3 +-- 9 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c index ba3d22702f4..98a6661e4cc 100644 --- a/src/intel/vulkan/anv_batch_chain.c +++ b/src/intel/vulkan/anv_batch_chain.c @@ -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); diff --git a/src/intel/vulkan/anv_gem_stubs.c b/src/intel/vulkan/anv_gem_stubs.c index aa592ffc3eb..38d20b41381 100644 --- a/src/intel/vulkan/anv_gem_stubs.c +++ b/src/intel/vulkan/anv_gem_stubs.c @@ -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; diff --git a/src/intel/vulkan/anv_kmd_backend.h b/src/intel/vulkan/anv_kmd_backend.h index 792466120de..363cfded5f5 100644 --- a/src/intel/vulkan/anv_kmd_backend.h +++ b/src/intel/vulkan/anv_kmd_backend.h @@ -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, diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index ecc63100334..7a870fdf793 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -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, diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 5e7d0ff2844..a699804f372 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -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; diff --git a/src/intel/vulkan/i915/anv_batch_chain.c b/src/intel/vulkan/i915/anv_batch_chain.c index ff9b8cd5123..5540e410d26 100644 --- a/src/intel/vulkan/i915/anv_batch_chain.c +++ b/src/intel/vulkan/i915/anv_batch_chain.c @@ -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 = { diff --git a/src/intel/vulkan/i915/anv_batch_chain.h b/src/intel/vulkan/i915/anv_batch_chain.h index 715e27fd426..37d55a62b6b 100644 --- a/src/intel/vulkan/i915/anv_batch_chain.h +++ b/src/intel/vulkan/i915/anv_batch_chain.h @@ -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 diff --git a/src/intel/vulkan/xe/anv_batch_chain.c b/src/intel/vulkan/xe/anv_batch_chain.c index a04dcfef791..00fc295d923 100644 --- a/src/intel/vulkan/xe/anv_batch_chain.c +++ b/src/intel/vulkan/xe/anv_batch_chain.c @@ -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; diff --git a/src/intel/vulkan/xe/anv_batch_chain.h b/src/intel/vulkan/xe/anv_batch_chain.h index b1bf6aff55e..d3bd8232607 100644 --- a/src/intel/vulkan/xe/anv_batch_chain.h +++ b/src/intel/vulkan/xe/anv_batch_chain.h @@ -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
