From 13d50cfb54801493a85258d667065c8d0aefcbbe Mon Sep 17 00:00:00 2001 From: Karmjit Mahil Date: Tue, 29 Apr 2025 15:45:58 +0100 Subject: [PATCH] tu: Fix segfault in fail_submit KGSL path Fixes: ec268fa5b66 ("tu/kgsl: Support u_trace and perfetto") Part-of: (cherry picked from commit 9dfd4a091c83d7a393f3ceac0607cc71e5df0ae8) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_knl_kgsl.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 018c9e1c8e8..71a021d4ca1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6064,7 +6064,7 @@ "description": "tu: Fix segfault in fail_submit KGSL path", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ec268fa5b666a49adafc431dbc05b73bfd74526e", "notes": null diff --git a/src/freedreno/vulkan/tu_knl_kgsl.cc b/src/freedreno/vulkan/tu_knl_kgsl.cc index d9dcd64d3f9..5410cac3b41 100644 --- a/src/freedreno/vulkan/tu_knl_kgsl.cc +++ b/src/freedreno/vulkan/tu_knl_kgsl.cc @@ -1296,7 +1296,7 @@ kgsl_queue_submit(struct tu_queue *queue, void *_submit, } fail_submit: - if (result != VK_SUCCESS) { + if (result != VK_SUCCESS && u_trace_submission_data) { mtx_lock(&queue->device->kgsl_profiling_mutex); tu_suballoc_bo_free(&queue->device->kgsl_profiling_suballoc, &u_trace_submission_data->kgsl_timestamp_bo);