xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-present.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 56ba0b2a5f1052c5a2a0503fb2cea89b273de56f
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Wed Oct 2 15:19:46 2024 +0200

    xwayland/present: Check allow_commits in xwl_present_flip
    
    We're not supposed to call wl_surface_commit while
    xwl_window->allow_commits is false. Bailing results in falling back to
    a copy.
    
    Noticed by inspection while looking into an issue which turned out to be
    due to something else.
    
    Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1764
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1732>

diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
index 5a7d7a156..07d58ee6a 100644
--- a/hw/xwayland/xwayland-present.c
+++ b/hw/xwayland/xwayland-present.c
@@ -870,7 +870,7 @@ xwl_present_flip(present_vblank_ptr vblank, RegionPtr damage)
     struct xwl_present_event    *event = xwl_present_event_from_vblank(vblank);
     Bool                        implicit_sync = TRUE;
 
-    if (!xwl_window)
+    if (!xwl_window || !xwl_window->allow_commits)
         return FALSE;
 
     buffer = xwl_pixmap_get_wl_buffer(pixmap);