xserver: Branch 'master'

Adam Jackson ajax at kemper.freedesktop.org
Mon Apr 2 16:29:03 UTC 2018


 glamor/glamor_egl.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 258081759fa70202a2e6134eeee4fe25ca54bedb
Author: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
Date:   Fri Mar 30 22:31:46 2018 +0200

    glamor: sanitze handling of "Debug" Option for "dmabuf_capable"
    
    With the appearance of the this new Option the X Server would crash if the
    option is not set.
    
    Default dmabuf_capable to off/FALSE for now - a user without knowledge about
    this option does not want to enable it until its save.
    
    Fixes: d11d5bb80 ("glamor: Hide new DRI behind Option "Debug" "dmabuf_capable")
    Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 4a550932a..f82fa519b 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -960,9 +960,13 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
     if (epoxy_has_egl_extension(glamor_egl->display,
                                 "EGL_EXT_image_dma_buf_import") &&
         epoxy_has_egl_extension(glamor_egl->display,
-                                "EGL_EXT_image_dma_buf_import_modifiers"))
-        glamor_egl->dmabuf_capable = !!strstr(xf86Info.debug,
-                                              "dmabuf_capable");
+                                "EGL_EXT_image_dma_buf_import_modifiers")) {
+       if (xf86Info.debug != NULL)
+           glamor_egl->dmabuf_capable = !!strstr(xf86Info.debug,
+                                                "dmabuf_capable");
+        else
+            glamor_egl->dmabuf_capable = FALSE;
+    }
 #endif
 
     glamor_egl->saved_free_screen = scrn->FreeScreen;


More information about the xorg-commit mailing list