xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 .gitlab-ci.yml                          |    2 +-
 hw/xwayland/xwayland-glamor-eglstream.c |    7 ++++++-
 hw/xwayland/xwayland-glamor.c           |    3 +++
 hw/xwayland/xwayland-present.c          |    3 ---
 4 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 104c7c50485238a1e8c2090dc96126e9624ef870
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Tue May 18 18:02:59 2021 +0200

    xwayland/present: Move wl_buffer check into xwl_glamor_check_flip
    
    Keeps the glamor specific code together more.
    
    Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index e940f9fd7..2729e8747 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -84,6 +84,9 @@ xwl_glamor_check_flip(PixmapPtr pixmap)
 {
     struct xwl_screen *xwl_screen = xwl_screen_get(pixmap->drawable.pScreen);
 
+    if (!xwl_glamor_pixmap_get_wl_buffer(pixmap))
+        return FALSE;
+
     if (xwl_screen->egl_backend->check_flip)
         return xwl_screen->egl_backend->check_flip(pixmap);
 
diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
index c0f128833..83d67517a 100644
--- a/hw/xwayland/xwayland-present.c
+++ b/hw/xwayland/xwayland-present.c
@@ -404,9 +404,6 @@ xwl_present_check_flip2(RRCrtcPtr crtc,
     if (!xwl_window)
         return FALSE;
 
-    if (!xwl_glamor_pixmap_get_wl_buffer(pixmap))
-        return FALSE;
-
     if (!xwl_glamor_check_flip(pixmap))
         return FALSE;
 
commit 3641c24bd012d032ec289cde312a9a5a3ba8c3bf
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Tue May 18 17:56:50 2021 +0200

    xwayland/eglstream: Handle xwl_pixmap_get returning NULL
    
    In xwl_glamor_eglstream_get_wl_buffer_for_pixmap. This can likely be hit
    now with an SHM pixmap via the Present flip path. There might be other
    corner cases.
    
    Fixes: f3eb1684fa50 "xwayland: enable MIT-SHM shared pixmaps"
    Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
index 0affc954c..032f8a600 100644
--- a/hw/xwayland/xwayland-glamor-eglstream.c
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
@@ -334,7 +334,12 @@ xwl_glamor_eglstream_destroy_pixmap(PixmapPtr pixmap)
 static struct wl_buffer *
 xwl_glamor_eglstream_get_wl_buffer_for_pixmap(PixmapPtr pixmap)
 {
-    return xwl_pixmap_get(pixmap)->buffer;
+    struct xwl_pixmap *xwl_pixmap = xwl_pixmap_get(pixmap);
+
+    if (!xwl_pixmap)
+        return NULL;
+
+    return xwl_pixmap->buffer;
 }
 
 static void
commit d163e0a1d5ec54cc726d45a239a0777d0a84d610
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Jun 11 18:25:01 2021 +0200

    ci: Fix UPSTREAM_REPO -> FDO_UPSTREAM_REPO
    
    The latter is what ci-templates expect.
    
    Fixes: ab73c16930d6 "ci: Update to the latest templates"
    Reviewed-by: Simon Ser <contact at emersion.fr>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6cdb346c7..157a53006 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@
 # gcc/clang or other packages, which might break the build with older commits
 # using the same tag.
 variables:
-    UPSTREAM_REPO: xorg/xserver
+    FDO_UPSTREAM_REPO: xorg/xserver
     FDO_DISTRIBUTION_VERSION: buster-slim
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
     FDO_DISTRIBUTION_TAG: "2021-05-17"