frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland/present: Skip queued flip when a new one becomes ready 

If multiple flips become ready for the same MSC, we would previously
execute them all sequentially, one per MSC for sync flips. This could
result in an unbounded flip queue and corresponding memory consumption.

With implicit sync, leave the mailbox handling to the compositor for
async flips though.

v2:
* Use present_vblank_rec::sync_flip.

Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1664
Fixes: e1f16fb1ac ("xwayland: don't scrap pending present requests")
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1511>
This commit is contained in:
Michel Dänzer 2024-04-26 12:44:52 +02:00 committed by Marge Bot
parent 80f74b0e44
commit 0d9a54aa97
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/xwayland/xwayland-present.c
View File

@ -1053,6 +1053,25 @@ retry:
} }
if (flip_pending && vblank->flip && !notify_only) { if (flip_pending && vblank->flip && !notify_only) {
present_vblank_ptr flip_queued_last;
flip_queued_last = xorg_list_last_entry(&xwl_present_window->flip_queue,
present_vblank_rec, event_queue);
/* Do mailbox handling for queued flips, to prevent the flip queue from
* growing unbounded.
*/
if (flip_queued_last != flip_pending &&
(flip_queued_last->sync_flip
#ifdef DRI3
|| vblank->acquire_syncobj
#endif
)) {
xorg_list_del(&flip_queued_last->event_queue);
present_vblank_scrap(flip_queued_last);
xwl_present_re_execute(flip_queued_last);
}
DebugPresent(("\tr %" PRIu64 " %p (pending %p)\n", DebugPresent(("\tr %" PRIu64 " %p (pending %p)\n",
vblank->event_id, vblank, flip_pending)); vblank->event_id, vblank, flip_pending));
xorg_list_append(&vblank->event_queue, &xwl_present_window->flip_queue); xorg_list_append(&vblank->event_queue, &xwl_present_window->flip_queue);