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

vulkan/wsi/x11: wait for acquirable images in FIFO mode

Browse source 
In FIFO presentation mode we block either on our present-queue or on Present
events after an image was transmitted.

In case we receive completion events without idle events at some point we
exhaust our acquire-queue and can not block anymore on present-queue.

Ensure that the consumer has at least one image to acquire before blocking
again on present-queue. Otherwise wait for one from the X server.

CC: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3344
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Simon Ser <contact@emersion.fr>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6513>
(cherry picked from commit ec5e918ef4)
This commit is contained in:
Roman Gilg 2020-08-31 11:35:16 +02:00 • committed by Eric Engestrom
parent 6125dc5b66
commit 324c5269c9
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -769,7 +769,7 @@
"description": "vulkan/wsi/x11: wait for acquirable images in FIFO mode",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

15
src/vulkan/wsi/wsi_common_x11.c
View file

@ -1112,11 +1112,9 @@ x11_manage_fifo_queues(void *state)
assert(chain->has_present_queue);
while (chain->status >= 0) {
/* It should be safe to unconditionally block here. Later in the loop
* we blocks until the previous present has landed on-screen. At that
* point, we should have received IDLE_NOTIFY on all images presented
* before that point so the client should be able to acquire any image
* other than the currently presented one.
/* We can block here unconditionally because after an image was sent to
* the server (later on in this loop) we ensure at least one image is
* acquirable by the consumer or wait there on such an event.
*/
uint32_t image_index = 0;
result = wsi_queue_pull(&chain->present_queue, &image_index, INT64_MAX);
@ -1149,7 +1147,12 @@ x11_manage_fifo_queues(void *state)
goto fail;
if (chain->has_acquire_queue) {
while (chain->last_present_msc < target_msc) {
/* Wait for our presentation to occur and ensure we have at least one
* image that can be acquired by the client afterwards. This ensures we
* can pull on the present-queue on the next loop.
*/
while (chain->last_present_msc < target_msc ||
chain->sent_image_count == chain->base.image_count) {
xcb_generic_event_t *event =
xcb_wait_for_special_event(chain->conn, chain->special_event);
if (!event) {