diff -up xf86-video-intel-2.99.916/src/sna/sna_dri2.c.dma xf86-video-intel-2.99.916/src/sna/sna_dri2.c
--- xf86-video-intel-2.99.916/src/sna/sna_dri2.c.dma	2014-10-03 01:00:55.438371801 +0000
+++ xf86-video-intel-2.99.916/src/sna/sna_dri2.c	2014-10-03 01:01:58.112724027 +0000
@@ -254,19 +254,7 @@ inline static void *dri2_window_get_fron
 
 #else
 
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,904,0)
-/* Prime fixed for triple buffer support */
 #define xorg_can_triple_buffer(ptr) 1
-#elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,12,99,901,0)
-/* Before numGPUScreens was introduced */
-#define xorg_can_triple_buffer(ptr) 1
-#else
-/* Subject to crashers when combining triple buffering and Prime */
-inline static bool xorg_can_triple_buffer(struct sna *sna)
-{
-	return screenInfo.numGPUScreens == 0;
-}
-#endif
 
 static Bool
 sna_dri2_swap_limit_validate(DrawablePtr draw, int swap_limit)