From 213edd1841af72a3a4ec230262840d15fa40d74e Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 20 Oct 2021 13:38:19 -0500 Subject: [PATCH] anv: Remove the last remnants of in/out fences This should have been dropped as part of d44ea09e61f4 ("anv: Drop unused sync_file and BO semaphore code") but we missed a few bits. Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_batch_chain.c | 14 -------------- src/intel/vulkan/anv_private.h | 4 ---- src/intel/vulkan/anv_queue.c | 11 ----------- 3 files changed, 29 deletions(-) diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c index 70e1cbf4375..7149644f2a0 100644 --- a/src/intel/vulkan/anv_batch_chain.c +++ b/src/intel/vulkan/anv_batch_chain.c @@ -1992,17 +1992,6 @@ anv_queue_execbuf_locked(struct anv_queue *queue, } } - if (submit->in_fence != -1) { - assert(!device->has_thread_submit); - execbuf.execbuf.flags |= I915_EXEC_FENCE_IN; - execbuf.execbuf.rsvd2 |= (uint32_t)submit->in_fence; - } - - if (submit->need_out_fence) { - assert(!device->has_thread_submit); - execbuf.execbuf.flags |= I915_EXEC_FENCE_OUT; - } - if (has_perf_query) { struct anv_query_pool *query_pool = submit->perf_query_pool; assert(submit->perf_query_pass < query_pool->n_passes); @@ -2058,9 +2047,6 @@ anv_queue_execbuf_locked(struct anv_queue *queue, execbuf.bos[k]->offset = objects[k].offset; } - if (result == VK_SUCCESS && submit->need_out_fence) - submit->out_fence = execbuf.execbuf.rsvd2 >> 32; - error: pthread_cond_broadcast(&device->queue_submit); diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index edccfbc2a55..53a7026a6b0 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -1045,10 +1045,6 @@ struct anv_queue_submit { uint32_t signal_timeline_array_length; uint64_t * signal_timeline_values; - int in_fence; - bool need_out_fence; - int out_fence; - uint32_t fence_bo_count; uint32_t fence_bo_array_length; /* An array of struct anv_bo pointers with lower bit used as a flag to diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c index 677ffc3a935..331c51ac9e1 100644 --- a/src/intel/vulkan/anv_queue.c +++ b/src/intel/vulkan/anv_queue.c @@ -91,15 +91,6 @@ anv_queue_submit_free(struct anv_device *device, for (uint32_t i = 0; i < submit->temporary_semaphore_count; i++) anv_semaphore_impl_cleanup(device, &submit->temporary_semaphores[i]); - /* Execbuf does not consume the in_fence. It's our job to close it. */ - if (submit->in_fence != -1) { - assert(!device->has_thread_submit); - close(submit->in_fence); - } - if (submit->out_fence != -1) { - assert(!device->has_thread_submit); - close(submit->out_fence); - } vk_free(alloc, submit->fences); vk_free(alloc, submit->fence_values); vk_free(alloc, submit->temporary_semaphores); @@ -730,8 +721,6 @@ anv_queue_submit_alloc(struct anv_device *device) submit->alloc = alloc; submit->alloc_scope = alloc_scope; - submit->in_fence = -1; - submit->out_fence = -1; submit->perf_query_pass = -1; return submit;