xserver: Branch 'master'

[GitLab Mirror]

 glamor/glamor_egl.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 376cef6710c1acbde8b141c5e1a2bdc4380af29b
Author: Faith Ekstrand <faith.ekstrand at collabora.com>
Date:   Thu Mar 6 18:44:59 2025 -0600

    glamor: Enable dma-buf on Zink
    
    Zink badly needs dma-buf and modifiers as it can't handle BO import of
    tiled buffers without modifiers.
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1857>

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 668eddc86..5302df675 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -1218,6 +1218,8 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
                                                   "dmabuf_capable");
         else if (strstr((const char *)renderer, "Intel"))
             glamor_egl->dmabuf_capable = TRUE;
+        else if (strstr((const char *)renderer, "zink"))
+            glamor_egl->dmabuf_capable = TRUE;
         else
             glamor_egl->dmabuf_capable = FALSE;
     }