Module: Mesa Branch: staging/23.0 Commit: cf4ce99b947fdddd14c4518e891a6d0c1151175c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf4ce99b947fdddd14c4518e891a6d0c1151175c
Author: Lionel Landwerlin <[email protected]> Date: Sat Mar 18 23:30:39 2023 +0200 anv: fix incorrect utrace bo release Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: c67c9688c3 ("anv/utrace: use a bo pool for utrace buffers") Reviewed-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22006> (cherry picked from commit 87a1d6423c6aac06ade993f4c3b81247b91d0a5c) --- .pick_status.json | 2 +- src/intel/vulkan/anv_utrace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6b4cba8cefb..c5acbb2f753 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4774,7 +4774,7 @@ "description": "anv: fix incorrect utrace bo release", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c67c9688c3ff61cc79787801b68ddd62cfbf66d7" }, diff --git a/src/intel/vulkan/anv_utrace.c b/src/intel/vulkan/anv_utrace.c index 3f081c4050b..1b00b3ebfe2 100644 --- a/src/intel/vulkan/anv_utrace.c +++ b/src/intel/vulkan/anv_utrace.c @@ -59,8 +59,8 @@ anv_utrace_delete_flush_data(struct u_trace_context *utctx, if (flush->trace_bo) { assert(flush->batch_bo); anv_reloc_list_finish(&flush->relocs, &device->vk.alloc); - anv_device_release_bo(device, flush->batch_bo); - anv_device_release_bo(device, flush->trace_bo); + anv_bo_pool_free(&device->utrace_bo_pool, flush->batch_bo); + anv_bo_pool_free(&device->utrace_bo_pool, flush->trace_bo); } vk_sync_destroy(&device->vk, flush->sync);
