xserver: Branch 'master'

[Peter Hutterer]

 hw/xfree86/drivers/modesetting/drmmode_display.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 7f0494671f95cfa33f6f2c7c74b20a21f239f8c5
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri May 6 05:41:58 2016 +1000

    modesetting: fix build with glamor disabled.
    
    Fix build without --enable-glamor.
    
    Caught by the arm tinderbox.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    Reviewed-by: Mark Kettenis <kettenis at openbsd.org>
    Tested-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 546673b..2cda523 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -287,6 +287,7 @@ drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
     drmmode_crtc->dpms_mode = mode;
 }
 
+#ifdef GLAMOR
 static PixmapPtr
 create_pixmap_for_fbcon(drmmode_ptr drmmode, ScrnInfoPtr pScrn, int fbcon_id)
 {
@@ -331,10 +332,12 @@ out_free_fb:
     drmModeFreeFB(fbcon);
     return pixmap;
 }
+#endif
 
 void
 drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
 {
+#ifdef GLAMOR
     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
     ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     PixmapPtr src, dst;
@@ -381,6 +384,7 @@ drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
     if (drmmode->fbcon_pixmap)
         pScrn->pScreen->DestroyPixmap(drmmode->fbcon_pixmap);
     drmmode->fbcon_pixmap = NULL;
+#endif
 }
 
 static Bool