fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan: Rename a bunch of vk_sync_timeline helpers

Browse source 
Whenever we assume the timeline state is locked, we use _locked, pass in
the timeline state explicitly, and rename it so it's clearly an action
which the timeline does on the point.  This makes it far more clear who
owns a reference to what and where.

Reviewed-by: Maíra Canal <mcanal@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35921>
(cherry picked from commit 54eb41588c)
This commit is contained in:
Faith Ekstrand 2025-07-22 09:26:35 -04:00 • committed by Eric Engestrom
parent 66ebd2847e
commit 7a52703c84
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1994,7 +1994,7 @@
"description": "vulkan: Rename a bunch of vk_sync_timeline helpers", "description": "vulkan: Rename a bunch of vk_sync_timeline helpers",
"nominated": false, "nominated": false,
"nomination_type": 0, "nomination_type": 0,
"resolution": 4, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null, "because_sha": null,
"notes": null "notes": null

32
src/vulkan/runtime/vk_sync_timeline.c
View file

@ -212,7 +212,7 @@ vk_sync_timeline_alloc_point(struct vk_device *device,
} }
static void static void
vk_sync_timeline_point_free_locked(struct vk_sync_timeline_state *state, vk_sync_timeline_free_point_locked(struct vk_sync_timeline_state *state,
struct vk_sync_timeline_point *point) struct vk_sync_timeline_point *point)
{ {
assert(point->refcount == 0 && !point->pending); assert(point->refcount == 0 && !point->pending);
@ -226,29 +226,29 @@ vk_sync_timeline_point_free(struct vk_device *device,
struct vk_sync_timeline_state *state = point->timeline_state; struct vk_sync_timeline_state *state = point->timeline_state;
mtx_lock(&state->mutex); mtx_lock(&state->mutex);
vk_sync_timeline_point_free_locked(state, point); vk_sync_timeline_free_point_locked(state, point);
mtx_unlock(&state->mutex); mtx_unlock(&state->mutex);
} }
static void static void
vk_sync_timeline_point_ref(struct vk_sync_timeline_point *point) vk_sync_timeline_ref_point_locked(struct vk_sync_timeline_point *point)
{ {
point->refcount++; point->refcount++;
} }
static void static void
vk_sync_timeline_point_unref(struct vk_sync_timeline_state *state, vk_sync_timeline_unref_point_locked(struct vk_sync_timeline_state *state,
struct vk_sync_timeline_point *point) struct vk_sync_timeline_point *point)
{ {
assert(point->refcount > 0); assert(point->refcount > 0);
point->refcount--; point->refcount--;
if (point->refcount == 0 && !point->pending) if (point->refcount == 0)
vk_sync_timeline_point_free_locked(state, point); vk_sync_timeline_free_point_locked(state, point);
} }
static void static void
vk_sync_timeline_point_complete(struct vk_sync_timeline_state *state, vk_sync_timeline_complete_point_locked(struct vk_sync_timeline_state *state,
struct vk_sync_timeline_point *point) struct vk_sync_timeline_point *point)
{ {
if (!point->pending) if (!point->pending)
return; return;
@ -260,7 +260,7 @@ vk_sync_timeline_point_complete(struct vk_sync_timeline_state *state,
list_del(&point->link); list_del(&point->link);
if (point->refcount == 0) if (point->refcount == 0)
vk_sync_timeline_point_free_locked(state, point); vk_sync_timeline_free_point_locked(state, point);
} }
static VkResult static VkResult
@ -302,7 +302,7 @@ vk_sync_timeline_gc_locked(struct vk_device *device,
return result; return result;
} }
vk_sync_timeline_point_complete(state, point); vk_sync_timeline_complete_point_locked(state, point);
} }
return VK_SUCCESS; return VK_SUCCESS;
@ -348,7 +348,7 @@ vk_sync_timeline_get_point_locked(struct vk_device *device,
list_for_each_entry(struct vk_sync_timeline_point, point, list_for_each_entry(struct vk_sync_timeline_point, point,
&state->pending_points, link) { &state->pending_points, link) {
if (point->value >= wait_value) { if (point->value >= wait_value) {
vk_sync_timeline_point_ref(point); vk_sync_timeline_ref_point_locked(point);
*point_out = point; *point_out = point;
return VK_SUCCESS; return VK_SUCCESS;
} }
@ -380,7 +380,7 @@ vk_sync_timeline_point_release(struct vk_device *device,
struct vk_sync_timeline_state *state = point->timeline_state; struct vk_sync_timeline_state *state = point->timeline_state;
mtx_lock(&state->mutex); mtx_lock(&state->mutex);
vk_sync_timeline_point_unref(state, point); vk_sync_timeline_unref_point_locked(state, point);
mtx_unlock(&state->mutex); mtx_unlock(&state->mutex);
} }
@ -476,7 +476,7 @@ vk_sync_timeline_wait_locked(struct vk_device *device,
struct vk_sync_timeline_point *point = vk_sync_timeline_first_point(state); struct vk_sync_timeline_point *point = vk_sync_timeline_first_point(state);
/* Drop the lock while we wait. */ /* Drop the lock while we wait. */
vk_sync_timeline_point_ref(point); vk_sync_timeline_ref_point_locked(point);
mtx_unlock(&state->mutex); mtx_unlock(&state->mutex);
result = vk_sync_wait(device, &point->sync, 0, result = vk_sync_wait(device, &point->sync, 0,
@ -485,13 +485,13 @@ vk_sync_timeline_wait_locked(struct vk_device *device,
/* Pick the mutex back up */ /* Pick the mutex back up */
mtx_lock(&state->mutex); mtx_lock(&state->mutex);
vk_sync_timeline_point_unref(state, point); vk_sync_timeline_unref_point_locked(state, point);
/* This covers both VK_TIMEOUT and VK_ERROR_DEVICE_LOST */ /* This covers both VK_TIMEOUT and VK_ERROR_DEVICE_LOST */
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
vk_sync_timeline_point_complete(state, point); vk_sync_timeline_complete_point_locked(state, point);
} }
return VK_SUCCESS; return VK_SUCCESS;