diff --git a/glamor/glamor.c b/glamor/glamor.c
index 0f93e98b3..a0046f953 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -142,7 +142,7 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
 		return NullPixmap;
 
 	if ((usage == GLAMOR_CREATE_PIXMAP_CPU
-	     || usage == CREATE_PIXMAP_USAGE_GLYPH_PICTURE
+	     || (usage == CREATE_PIXMAP_USAGE_GLYPH_PICTURE && w <= 64 && h <= 64)
 		|| (w == 0 && h == 0)
 		|| !glamor_check_pixmap_fbo_depth(depth))
 	    || (!GLAMOR_TEXTURED_LARGE_PIXMAP &&