From a993dc20b67dd9094680c3560b514aae000a0039 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 20 Sep 2019 01:24:53 +0300 Subject: [PATCH] anv: remove list items on batch fini This doesn't seem to fix anything because those destroy() calls happen right before the command buffer object & its list of batch_bo is also destroyed. Still looks a bit cleaner. v2: Found a second occurence Signed-off-by: Lionel Landwerlin Reviewed-by: Jason Ekstrand (v2) Fixes: 26ba0ad54d ("vk: Re-name command buffer implementation files") Cc: (cherry picked from commit 935f8f0e56a409b10fac86e18f68be776cdff29f) --- src/intel/vulkan/anv_batch_chain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c index 1a8a3197427..5d1c3da16a6 100644 --- a/src/intel/vulkan/anv_batch_chain.c +++ b/src/intel/vulkan/anv_batch_chain.c @@ -478,8 +478,10 @@ anv_batch_bo_list_clone(const struct list_head *list, } if (result != VK_SUCCESS) { - list_for_each_entry_safe(struct anv_batch_bo, bbo, new_list, link) + list_for_each_entry_safe(struct anv_batch_bo, bbo, new_list, link) { + list_del(&bbo->link); anv_batch_bo_destroy(bbo, cmd_buffer); + } } return result; @@ -804,6 +806,7 @@ anv_cmd_buffer_fini_batch_bo_chain(struct anv_cmd_buffer *cmd_buffer) /* Destroy all of the batch buffers */ list_for_each_entry_safe(struct anv_batch_bo, bbo, &cmd_buffer->batch_bos, link) { + list_del(&bbo->link); anv_batch_bo_destroy(bbo, cmd_buffer); } }