summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Seurer <konstantin.seurer@gmail.com>2023-01-11 10:45:53 +0100
committerMarge Bot <emma+marge@anholt.net>2023-01-12 21:23:39 +0000
commit18e91ad329102d821f06ee3f874067b4d97d05e2 (patch)
tree475b743a6bd50a7ce699862ffc6378f3810ff854
parentaf55e36d798b91b86795544aac2d9e3983cde207 (diff)
radv: Fix deadlock in radv_rmv_log_event_create
Fixes: 8d0e6c0 ("radv: Add RMV tracing utilities") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20636>
-rw-r--r--src/amd/vulkan/radv_rmv.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/amd/vulkan/radv_rmv.c b/src/amd/vulkan/radv_rmv.c
index bee9038be0c..249fe7ea4ea 100644
--- a/src/amd/vulkan/radv_rmv.c
+++ b/src/amd/vulkan/radv_rmv.c
@@ -896,10 +896,11 @@ radv_rmv_log_event_create(struct radv_device *device, VkEvent _event, VkEventCre
vk_rmv_emit_token(&device->vk.memory_trace_data, VK_RMV_TOKEN_TYPE_RESOURCE_CREATE,
&create_token);
- if (event->map)
- vk_rmv_log_cpu_map(&device->vk, event->bo->va, false);
log_resource_bind_locked(device, (uint64_t)_event, event->bo, 0, 8);
simple_mtx_unlock(&device->vk.memory_trace_data.token_mtx);
+
+ if (event->map)
+ vk_rmv_log_cpu_map(&device->vk, event->bo->va, false);
}
void