From 81d8c071aca4d953aa07f2e021e033aa2d501e6c Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Tue, 12 Mar 2024 16:07:30 -0400 Subject: [PATCH] intel/isl: Remove inconsistency when choosing Tile64 We don't check the gfx version when choosing the tiling except when choosing Tile64. Drop the version check for consistency and to remove doubts about the order of operations occuring as expected within the CHOOSE macro. Reviewed-by: Lionel Landwerlin Reviewed-by: Rohan Garg Part-of: --- src/intel/isl/isl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 109f93f0456..a6cc05d876e 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -1114,7 +1114,8 @@ isl_surf_choose_tiling(const struct isl_device *dev, * shapes. */ if (info->usage & ISL_SURF_USAGE_SPARSE_BIT) { - CHOOSE(ISL_GFX_VER(dev) >= 20 ? ISL_TILING_64_XE2 : ISL_TILING_64); + CHOOSE(ISL_TILING_64_XE2); + CHOOSE(ISL_TILING_64); CHOOSE(ISL_TILING_ICL_Ys); CHOOSE(ISL_TILING_SKL_Ys); } @@ -1141,7 +1142,8 @@ isl_surf_choose_tiling(const struct isl_device *dev, CHOOSE(ISL_TILING_ICL_Yf); CHOOSE(ISL_TILING_SKL_Ys); CHOOSE(ISL_TILING_ICL_Ys); - CHOOSE(ISL_GFX_VER(dev) >= 20 ? ISL_TILING_64_XE2 : ISL_TILING_64); + CHOOSE(ISL_TILING_64); + CHOOSE(ISL_TILING_64_XE2); CHOOSE(ISL_TILING_X); CHOOSE(ISL_TILING_W);