fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 21:40:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/wsi/wayland: Adjust presentation id locking

Browse source 
If we want to use the new wl_display_dispatch_queue_timeout function
in libwayland we lose the ability to drop the lock while we poll
and pick it up again to dispatch.

That would cause other waiters to potentially block past their
timeouts while waiting for the dispatching thread's timeout.

Prepare for this change now by dropping the lock for the entire
dispatch, and reacquiring the lock in the functions being dispatched.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27851>
This commit is contained in:
Derek Foreman 2024-02-09 13:11:47 -06:00 • committed by Marge Bot
parent fb22b69df3
commit 7eaceb0392
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/vulkan/wsi/wsi_common_wayland.c
View file

@ -1762,6 +1762,7 @@ wsi_wl_swapchain_wait_for_present(struct wsi_swapchain *wsi_chain,
assert(!chain->present_ids.dispatch_in_progress);
chain->present_ids.dispatch_in_progress = true;
pthread_mutex_unlock(&chain->present_ids.lock);
/* Whether or not we were dispatching the events before, we are now: pull
* all the new events from our event queue, post them, and wake up everyone
@ -1777,7 +1778,9 @@ wsi_wl_swapchain_wait_for_present(struct wsi_swapchain *wsi_chain,
if (ret > 0) {
/* Completed our own present; stop our own dispatching and let
* someone else pick it up. */
pthread_mutex_lock(&chain->present_ids.lock);
if (chain->present_ids.max_completed >= present_id) {
pthread_mutex_unlock(&chain->present_ids.lock);
ret = VK_SUCCESS;
goto relinquish_dispatch;
}
@ -1785,6 +1788,7 @@ wsi_wl_swapchain_wait_for_present(struct wsi_swapchain *wsi_chain,
/* Wake up other waiters who may have been unblocked by the events
* we just read. */
pthread_cond_broadcast(&chain->present_ids.list_advanced);
pthread_mutex_unlock(&chain->present_ids.lock);
}
/* Check for timeout, and relinquish the dispatch to another thread
@ -1810,9 +1814,6 @@ wsi_wl_swapchain_wait_for_present(struct wsi_swapchain *wsi_chain,
goto relinquish_dispatch;
}
/* Drop the lock around poll, so people can wait whilst we sleep. */
pthread_mutex_unlock(&chain->present_ids.lock);
struct pollfd pollfd = {
.fd = wl_fd,
.events = POLLIN
@ -1822,11 +1823,6 @@ wsi_wl_swapchain_wait_for_present(struct wsi_swapchain *wsi_chain,
timespec_sub(&rel_timeout, &end_time, &current_time);
ret = ppoll(&pollfd, 1, &rel_timeout, NULL);
/* Re-lock after poll; either we're dispatching events under the lock or
* bouncing out from an error also under the lock. We can't use timedlock
* here because we need to acquire to clear dispatch_in_progress. */
pthread_mutex_lock(&chain->present_ids.lock);
if (ret <= 0) {
int lerrno = errno;
wl_display_cancel_read(wl_display);
@ -1849,6 +1845,7 @@ wsi_wl_swapchain_wait_for_present(struct wsi_swapchain *wsi_chain,
}
relinquish_dispatch:
pthread_mutex_lock(&chain->present_ids.lock);
assert(chain->present_ids.dispatch_in_progress);
chain->present_ids.dispatch_in_progress = false;
pthread_cond_broadcast(&chain->present_ids.list_advanced);
@ -1909,12 +1906,13 @@ presentation_handle_sync_output(void *data,
static void
wsi_wl_presentation_update_present_id(struct wsi_wl_present_id *id)
{
/* present_ids.lock already held around dispatch */
pthread_mutex_lock(&id->chain->present_ids.lock);
if (id->present_id > id->chain->present_ids.max_completed)
id->chain->present_ids.max_completed = id->present_id;
wl_list_remove(&id->link);
vk_free(id->alloc, id);
pthread_mutex_unlock(&id->chain->present_ids.lock);
}
static void