xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 2bf0f9e1139bc4364d8e86e772f0e44be6fe3277
Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
Date:   Sat Dec 16 08:38:11 2023 +0200

    glamor: Enable dmabuf_capable by default on Intel hardware
    
    With the potential modeset vs. modifiers issue covered by
    commit 899c87af1fc2 ("modesetting: unflip before any setcrtc() calls")
    we can safely enable modifiers by default, at least on Intel
    hardware where we know that things work properly.
    
    I suppose the one open question is whether everything will work
    correctly with wonky multi-GPU setups? I don't have one to test
    myself.
    
    Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index dc8409dcc..03bbfd2a2 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -1206,6 +1206,8 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
         if (xf86Info.debug != NULL)
             glamor_egl->dmabuf_capable = !!strstr(xf86Info.debug,
                                                   "dmabuf_capable");
+        else if (strstr((const char *)renderer, "Intel"))
+            glamor_egl->dmabuf_capable = TRUE;
         else
             glamor_egl->dmabuf_capable = FALSE;
     }