From 9dd9c3363b4aa0ef0586b75cab91f5efe2efbea8 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 8 Jan 2018 16:27:45 -0800 Subject: [PATCH] intel/genxml: Remove W-tiling on gen12 It's no longer supported by the hardware Reviewed-by: Nanley Chery --- src/intel/genxml/gen12.xml | 1 - src/intel/isl/isl_surface_state.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 @@ - 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, -- 2.30.2