diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
index ce243abcf..10066a6b5 100644
--- a/glamor/glamor_pixmap.c
+++ b/glamor/glamor_pixmap.c
@@ -497,7 +497,11 @@ ready_to_upload:
 	if (no_alpha == 0
 	    && revert == REVERT_NONE
 	    && swap_rb == SWAP_NONE_UPLOADING
-	    && !need_flip) {
+	    && !need_flip
+#ifdef WALKAROUND_LARGE_TEXTURE_MAP
+	    && pixmap_priv->type != GLAMOR_TEXTURE_LARGE
+#endif
+		) {
 		int fbo_x_off, fbo_y_off;
 		assert(pixmap_priv->base.fbo->tex);
 		pixmap_priv_get_fbo_off(pixmap_priv, &fbo_x_off, &fbo_y_off);
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 4fad5cd3b..642aff68c 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -1001,6 +1001,7 @@ glamor_poly_line(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
 //#define GLAMOR_TRAPEZOID_SHADER
 #endif
 #define GLAMOR_TEXTURED_LARGE_PIXMAP 1
+#define WALKAROUND_LARGE_TEXTURE_MAP
 #if 0
 #define MAX_FBO_SIZE 32 /* For test purpose only. */
 #endif