xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-present.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 2a2234ad1a0fe88400c1511fea67741e4ad09f7f
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Nov 29 09:40:13 2019 +0100

    xwayland: Do flush GPU work in xwl_present_flush
    
    The Present code sends the idle notification event to the client after
    xwl_present_flush returns. If we don't flush our GPU work here, the
    client may race to draw another frame to the same buffer, so we may end
    up copying (parts of) that new frame instead of the one we meant to.
    
    Fixes https://gitlab.freedesktop.org/xorg/xserver/issues/835
    
    Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
index 7f0b951ab..cfcf284af 100644
--- a/hw/xwayland/xwayland-present.c
+++ b/hw/xwayland/xwayland-present.c
@@ -24,6 +24,7 @@
  */
 
 #include "xwayland.h"
+#include "glamor.h"
 
 #include <present.h>
 
@@ -409,9 +410,7 @@ xwl_present_abort_vblank(WindowPtr present_window,
 static void
 xwl_present_flush(WindowPtr window)
 {
-    /* Only called when a Pixmap is copied instead of flipped,
-     * but in this case we wait on the next block_handler.
-     */
+    glamor_block_handler(window->drawable.pScreen);
 }
 
 static Bool