diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h
index 25213e456d3..fa5c04a910b 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -1525,7 +1525,9 @@ blorp_emit_null_surface_state(struct blorp_batch *batch,
       .SurfaceArray = surface->surf.dim != ISL_SURF_DIM_3D,
 #endif
 
-#if GFX_VER >= 8
+#if GFX_VERx10 >= 125
+      .TileMode = TILE4,
+#elif GFX_VER >= 8
       .TileMode = YMAJOR,
 #else
       .TiledSurface = true,
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 07bc833b5f3..0b6f9f4f176 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -733,8 +733,9 @@
     <field name="Vertical Line Stride" start="11" end="11" type="uint"/>
     <field name="Tile Mode" start="12" end="13" type="uint">
       <value name="LINEAR" value="0"/>
+      <value name="TILE64" value="1"/>
       <value name="XMAJOR" value="2"/>
-      <value name="YMAJOR" value="3"/>
+      <value name="TILE4"  value="3"/>
     </field>
     <field name="Surface Horizontal Alignment" start="14" end="15" type="uint">
       <value name="HALIGN 4" value="1"/>
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index 72e9d03402a..12c05782a0c 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -69,9 +69,14 @@ static const uint8_t isl_encode_valign[] = {
 static const uint8_t isl_encode_tiling[] = {
    [ISL_TILING_LINEAR]  = LINEAR,
    [ISL_TILING_X]       = XMAJOR,
+#if GFX_VERx10 >= 125
+   [ISL_TILING_4]       = TILE4,
+   [ISL_TILING_64]      = TILE64,
+#else
    [ISL_TILING_Y0]      = YMAJOR,
    [ISL_TILING_Yf]      = YMAJOR,
    [ISL_TILING_Ys]      = YMAJOR,
+#endif
 #if GFX_VER <= 11
    [ISL_TILING_W]       = WMAJOR,
 #endif
@@ -961,7 +966,9 @@ isl_genX(null_fill_state)(void *state,
 #if GFX_VER >= 7
       .SurfaceArray = info->size.depth > 1,
 #endif
-#if GFX_VER >= 8
+#if GFX_VERx10 >= 125
+      .TileMode = TILE4,
+#elif GFX_VER >= 8
       .TileMode = YMAJOR,
 #else
       .TiledSurface = true,