diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 5af5900..06d1ec0 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -150,7 +150,8 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
 		}
 	}
 
-	if (!radeon_glamor_create_textured_pixmap(pixmap,
+	if (info->use_glamor &&
+	    !radeon_glamor_create_textured_pixmap(pixmap,
 						  radeon_get_pixmap_private(pixmap))) {
 		pScreen->DestroyPixmap(pixmap);
 	  	return NULL;
diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index f00967f..4b6b024 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -153,12 +153,6 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
 Bool
 radeon_glamor_create_textured_pixmap(PixmapPtr pixmap, struct radeon_pixmap *priv)
 {
-	ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen);
-	RADEONInfoPtr info = RADEONPTR(scrn);
-
-	if ((info->use_glamor) == 0)
-		return TRUE;
-
 	return glamor_egl_create_textured_pixmap(pixmap, priv->bo->handle,
 						 pixmap->devKind);
 }