diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index d2bc8a11853..850e5b1ee95 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -1538,6 +1538,10 @@ isl_surf_init_s(const struct isl_device *dev,
       base_alignment_B = MAX(info->min_alignment_B, tile_size_B);
    }
 
+   if (ISL_DEV_GEN(dev) >= 12) {
+      base_alignment_B = MAX(base_alignment_B, 64 * 1024);
+   }
+
    if (ISL_DEV_GEN(dev) < 9) {
       /* From the Broadwell PRM Vol 5, Surface Layout:
        *