diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel/genxml/gen12.xml | 1 | ||||
| -rw-r--r-- | src/intel/isl/isl_surface_state.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml index 609535bc1e4..f890df96d51 100644 --- a/src/intel/genxml/gen12.xml +++ b/src/intel/genxml/gen12.xml @@ -678,7 +678,6 @@ <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="WMAJOR" value="1"/> <value name="XMAJOR" value="2"/> <value name="YMAJOR" value="3"/> </field> diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c index b22657e54c2..8a16fac5b3b 100644 --- a/src/intel/isl/isl_surface_state.c +++ b/src/intel/isl/isl_surface_state.c @@ -72,7 +72,9 @@ static const uint8_t isl_to_gen_tiling[] = { [ISL_TILING_Y0] = YMAJOR, [ISL_TILING_Yf] = YMAJOR, [ISL_TILING_Ys] = YMAJOR, +#if GEN_GEN <= 11 [ISL_TILING_W] = WMAJOR, +#endif }; #endif @@ -447,6 +449,7 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, #endif #if GEN_GEN >= 8 + assert(GEN_GEN < 12 || info->surf->tiling != ISL_TILING_W); s.TileMode = isl_to_gen_tiling[info->surf->tiling]; #else s.TiledSurface = info->surf->tiling != ISL_TILING_LINEAR, |