fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 08:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vl/dri3: avoid deadlocking when polling deleted windows for events

Browse source 
upcoming xserver releases will emit PresentConfigureNotify with this
flag set when a window is destroyed, ensuring drivers
don't poll infinitely and deadlock

Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>

Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21339>
This commit is contained in:
Mike Blumenkrantz 2023-02-15 10:10:26 -05:00 • committed by Marge Bot
parent 819cbf329a
commit 41286f100e
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gallium/auxiliary/vl/vl_winsys_dri3.c
View file

@ -133,13 +133,21 @@ dri3_handle_stamps(struct vl_dri3_screen *scrn, uint64_t ust, uint64_t msc)
scrn->last_msc = msc;
}
static void
/* XXX this belongs in presentproto */
#ifndef PresentWindowDestroyed
#define PresentWindowDestroyed (1 << 0)
#endif
static bool
dri3_handle_present_event(struct vl_dri3_screen *scrn,
xcb_present_generic_event_t *ge)
{
switch (ge->evtype) {
case XCB_PRESENT_CONFIGURE_NOTIFY: {
xcb_present_configure_notify_event_t *ce = (void *) ge;
if (ce->pixmap_flags & PresentWindowDestroyed) {
free(ge);
return false;
}
scrn->width = ce->width;
scrn->height = ce->height;
break;
@ -171,6 +179,7 @@ dri3_handle_present_event(struct vl_dri3_screen *scrn,
}
}
free(ge);
return true;
}
static void
@ -179,8 +188,10 @@ dri3_flush_present_events(struct vl_dri3_screen *scrn)
if (scrn->special_event) {
xcb_generic_event_t *ev;
while ((ev = xcb_poll_for_special_event(
scrn->conn, scrn->special_event)) != NULL)
dri3_handle_present_event(scrn, (xcb_present_generic_event_t *)ev);
scrn->conn, scrn->special_event)) != NULL) {
if (!dri3_handle_present_event(scrn, (xcb_present_generic_event_t *)ev))
break;
}
}
}
@ -192,8 +203,7 @@ dri3_wait_present_events(struct vl_dri3_screen *scrn)
ev = xcb_wait_for_special_event(scrn->conn, scrn->special_event);
if (!ev)
return false;
dri3_handle_present_event(scrn, (xcb_present_generic_event_t *)ev);
return true;
return dri3_handle_present_event(scrn, (xcb_present_generic_event_t *)ev);
}
return false;
}