xserver: Branch 'master'

[Michel Dänzer]

 hw/xwayland/xwayland-glamor-gbm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6300049a9a4b84789a2e8141f5cad17adf22185c
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue May 29 10:39:22 2018 +1000

    xwayland: fix typo in non-modifier fallback path
    
    Pointed out on irc by q66.
    Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index 29325adac..68c2cc32e 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -272,7 +272,7 @@ xwl_glamor_gbm_get_wl_buffer_for_pixmap(PixmapPtr pixmap,
 #else
     num_planes = 1;
     modifier = DRM_FORMAT_MOD_INVALID;
-    strides[0] = gbm_go_get_stride(xwl_pixmap->bo);
+    strides[0] = gbm_bo_get_stride(xwl_pixmap->bo);
     offsets[0] = 0;
 #endif