diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 122dda71..29e09e33 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -488,7 +488,7 @@ restart:
 		     bo->tiling, tiling,
 		     bo->pitch, stride,
 		     set_tiling.tiling_mode == tiling));
-		return set_tiling.tiling_mode == tiling;
+		return set_tiling.tiling_mode == tiling && bo->pitch >= stride;
 	}
 
 	err = errno;