diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index b1c6df0f..c03592db 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -104,11 +104,7 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
 			   "glamor may not work (well) with GPUs < RV515.\n");
 	}
 
-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,20,99,0,0)
-	if (scrn->depth < 24) {
-#else
 	if (scrn->depth < 15) {
-#endif
 		xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING,
 			   "Depth %d not supported with glamor, disabling\n",
 			   scrn->depth);
diff --git a/src/radeon_present.c b/src/radeon_present.c
index d010aa19..303e187f 100644
--- a/src/radeon_present.c
+++ b/src/radeon_present.c
@@ -275,11 +275,6 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap,
     if (info->drmmode.dri2_flipping)
 	return FALSE;
 
-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(1, 20, 99, 1, 0)
-    if (pixmap->devKind != screen_pixmap->devKind)
-	return FALSE;
-#endif
-
 #ifdef USE_GLAMOR
     if (priv && priv->fb_failed)
 	return FALSE;