xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 66726064204b869a24e5a8dc6e24daa5acb92bab
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Dec 30 11:51:43 2014 -0800

    modesetting: Fix build with --disable-glamor.
    
    present.c: In function 'ms_present_flush':
    present.c:204:9: error: implicit declaration of function
    'glamor_block_handler'
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87858
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Jasper St. Pierre <jstpierre at mecheye.net>
    Reviewed-by: Rob Clark <robdclark at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/drivers/modesetting/present.c b/hw/xfree86/drivers/modesetting/present.c
index 63d7b76..359e113 100644
--- a/hw/xfree86/drivers/modesetting/present.c
+++ b/hw/xfree86/drivers/modesetting/present.c
@@ -196,12 +196,14 @@ ms_present_abort_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc)
 static void
 ms_present_flush(WindowPtr window)
 {
+#ifdef GLAMOR
     ScreenPtr screen = window->drawable.pScreen;
     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
     modesettingPtr ms = modesettingPTR(scrn);
 
     if (ms->drmmode.glamor)
         glamor_block_handler(screen);
+#endif
 }
 
 static present_screen_info_rec ms_present_screen_info = {