From 7b59d092993548d1332ffb0f4a6c81b604b5c87d Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Thu, 7 Aug 2025 21:22:16 +0000
Subject: [PATCH] venus: drop vn_trace_init

No longer needed.

Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36655>
---
 src/virtio/vulkan/vn_common.c   | 10 ----------
 src/virtio/vulkan/vn_common.h   |  3 ---
 src/virtio/vulkan/vn_instance.c |  6 +++---
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/virtio/vulkan/vn_common.c b/src/virtio/vulkan/vn_common.c
index f8f9a1fc9cf..63d9138c5df 100644
--- a/src/virtio/vulkan/vn_common.c
+++ b/src/virtio/vulkan/vn_common.c
@@ -86,16 +86,6 @@ vn_env_init(void)
    }
 }
 
-void
-vn_trace_init(void)
-{
-#if DETECT_OS_ANDROID
-   atrace_init();
-#else
-   util_cpu_trace_init();
-#endif
-}
-
 void
 vn_log(struct vn_instance *instance, const char *format, ...)
 {
diff --git a/src/virtio/vulkan/vn_common.h b/src/virtio/vulkan/vn_common.h
index 73fc35173c7..4e6df44f7a7 100644
--- a/src/virtio/vulkan/vn_common.h
+++ b/src/virtio/vulkan/vn_common.h
@@ -307,9 +307,6 @@ struct vn_cached_storage {
 void
 vn_env_init(void);
 
-void
-vn_trace_init(void);
-
 void
 vn_log(struct vn_instance *instance, const char *format, ...)
    PRINTFLIKE(2, 3);
diff --git a/src/virtio/vulkan/vn_instance.c b/src/virtio/vulkan/vn_instance.c
index 1942d77f67c..523f0590e9a 100644
--- a/src/virtio/vulkan/vn_instance.c
+++ b/src/virtio/vulkan/vn_instance.c
@@ -268,9 +268,6 @@ vn_CreateInstance(const VkInstanceCreateInfo *pCreateInfo,
                   const VkAllocationCallbacks *pAllocator,
                   VkInstance *pInstance)
 {
-   vn_trace_init();
-   VN_TRACE_FUNC();
-
    const VkAllocationCallbacks *alloc =
       pAllocator ? pAllocator : vk_default_allocator();
    struct vn_instance *instance;
@@ -296,6 +293,9 @@ vn_CreateInstance(const VkInstanceCreateInfo *pCreateInfo,
       return vn_error(NULL, result);
    }
 
+   /* util_cpu_trace_init is called by vk_instance_init */
+   VN_TRACE_FUNC();
+
    VkInstance instance_handle = vn_instance_to_handle(instance);
    /* ring_idx = 0 reserved for CPU timeline */
    instance->ring_idx_used_mask = 0x1;