mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-13 08:22:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'await-completion' into 'master'

Browse source 
wlr_linux_drm_syncobj_v1: Lock surface state until acquire signal

See merge request wlroots/wlroots!5289
This commit is contained in:
Kenny Levinsen 2026-04-12 13:53:20 +00:00
commit b2bfae5619
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
types/wlr_linux_drm_syncobj_v1.c
View file

@ -232,15 +232,14 @@ static void surface_commit_handle_surface_destroy(struct wl_listener *listener,
surface_commit_destroy(commit);
}
// Block the surface commit until the fence materializes
// Block the surface commit until the fence signals
static bool lock_surface_commit(struct wlr_linux_drm_syncobj_surface_v1 *surface,
struct wlr_drm_syncobj_timeline *timeline, uint64_t point) {
uint32_t flags = DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE;
bool already_materialized = false;
if (!wlr_drm_syncobj_timeline_check(timeline, point, flags, &already_materialized)) {
bool already_signaled = false;
if (!wlr_drm_syncobj_timeline_check(timeline, point,
DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT, &already_signaled)) {
return false;
} else if (already_materialized) {
} else if (already_signaled) {
return true;
}
@ -253,7 +252,7 @@ static bool lock_surface_commit(struct wlr_linux_drm_syncobj_surface_v1 *surface
struct wl_display *display = wl_client_get_display(client);
struct wl_event_loop *loop = wl_display_get_event_loop(display);
if (!wlr_drm_syncobj_timeline_waiter_init(&commit->waiter, timeline, point,
flags, loop, surface_commit_handle_waiter_ready)) {
0, loop, surface_commit_handle_waiter_ready)) {
free(commit);
return false;
}