From 38c989ada2235e9cf88dc8ac5e350c1bcad47a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Fri, 16 Aug 2024 07:00:24 -0700 Subject: [PATCH] anv: Nuke anv_utrace_submit::trace_bo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no usage for this bo. Reviewed-by: Lionel Landwerlin Signed-off-by: José Roberto de Souza Part-of: --- src/intel/vulkan/anv_private.h | 3 --- src/intel/vulkan/anv_utrace.c | 15 ++------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 516f32c87ea..d00c0110694 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -6229,9 +6229,6 @@ struct anv_utrace_submit { struct anv_state_stream dynamic_state_stream; struct anv_state_stream general_state_stream; - /* Buffer of 64bits timestamps (only used for timestamp copies) */ - struct anv_bo *trace_bo; - /* Last fully read 64bit timestamp (used to rebuild the upper bits of 32bit * timestamps) */ diff --git a/src/intel/vulkan/anv_utrace.c b/src/intel/vulkan/anv_utrace.c index 5ea61dcb760..63d32b7bef5 100644 --- a/src/intel/vulkan/anv_utrace.c +++ b/src/intel/vulkan/anv_utrace.c @@ -87,9 +87,6 @@ anv_utrace_delete_submit(struct u_trace_context *utctx, void *submit_data) anv_state_stream_finish(&submit->dynamic_state_stream); anv_state_stream_finish(&submit->general_state_stream); - if (submit->trace_bo) - anv_bo_pool_free(&device->utrace_bo_pool, submit->trace_bo); - anv_async_submit_fini(&submit->base); vk_free(&device->vk.alloc, submit); @@ -179,12 +176,6 @@ anv_device_utrace_flush_cmd_buffers(struct anv_queue *queue, struct anv_batch *batch = &submit->base.batch; if (utrace_copies > 0) { - result = anv_bo_pool_alloc(&device->utrace_bo_pool, - utrace_copies * 4096, - &submit->trace_bo); - if (result != VK_SUCCESS) - goto error_sync; - anv_state_stream_init(&submit->dynamic_state_stream, &device->dynamic_state_pool, 16384); anv_state_stream_init(&submit->general_state_stream, @@ -228,7 +219,7 @@ anv_device_utrace_flush_cmd_buffers(struct anv_queue *queue, ANV_INTERNAL_KERNEL_MEMCPY_COMPUTE, ©_kernel); if (ret != VK_SUCCESS) - goto error_batch; + goto error_sync; trace_intel_begin_trace_copy_cb(&submit->ds.trace, batch); @@ -266,7 +257,7 @@ anv_device_utrace_flush_cmd_buffers(struct anv_queue *queue, if (batch->status != VK_SUCCESS) { result = batch->status; - goto error_batch; + goto error_sync; } intel_ds_queue_flush_data(&queue->ds, &submit->ds.trace, &submit->ds, @@ -284,8 +275,6 @@ anv_device_utrace_flush_cmd_buffers(struct anv_queue *queue, return VK_SUCCESS; - error_batch: - anv_bo_pool_free(&device->utrace_bo_pool, submit->trace_bo); error_sync: intel_ds_flush_data_fini(&submit->ds); anv_async_submit_fini(&submit->base);