xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 9b8999411033c9473cd68e92e4690a91aecf5b95
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jun 6 15:56:26 2018 -0400

    glamor: Enable modifier support for xfree86 too
    
    This was left disabled in 1.20.0, it's time to start being sure it
    works.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Acked-by: Keith Packard <keithp at keithp.com>
    Acked-by: Daniel Stone <daniels at collabora.com>

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 123e9f28d..4a4ca4bd8 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -999,8 +999,8 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
        if (xf86Info.debug != NULL)
            glamor_egl->dmabuf_capable = !!strstr(xf86Info.debug,
                                                 "dmabuf_capable");
-        else
-            glamor_egl->dmabuf_capable = FALSE;
+       else
+           glamor_egl->dmabuf_capable = TRUE;
     }
 #endif