From 69d3bb99154285bb16e8ce0f5d5cefed0d395a15 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 1 Sep 2016 22:01:47 -0700 Subject: [PATCH] intel/isl: Handle HiZ and CCS tiling more directly The HiZ and CCS tiling formats are always used for HiZ and CCS surfaces respectively. There's no reason why we should go through filter_tiling and it's much easier to always get HiZ and CCS right if we just handle them directly. Signed-off-by: Jason Ekstrand Reviewed-by: Topi Pohjolainen Reviewed-by: Chad Versace Reviewed-by: Nanley Chery --- src/intel/isl/isl.c | 18 ++++++++++++++++-- src/intel/isl/isl_gen7.c | 14 -------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index a53f46feb4f..9ae2bfefb44 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -236,6 +236,22 @@ isl_surf_choose_tiling(const struct isl_device *dev, { isl_tiling_flags_t tiling_flags = info->tiling_flags; + /* HiZ surfaces always use the HiZ tiling */ + if (info->usage & ISL_SURF_USAGE_HIZ_BIT) { + assert(info->format == ISL_FORMAT_HIZ); + assert(tiling_flags == ISL_TILING_HIZ_BIT); + *tiling = ISL_TILING_HIZ; + return true; + } + + /* CCS surfaces always use the CCS tiling */ + if (info->usage & ISL_SURF_USAGE_CCS_BIT) { + assert(isl_format_get_layout(info->format)->txc == ISL_TXC_CCS); + assert(tiling_flags == ISL_TILING_CCS_BIT); + *tiling = ISL_TILING_CCS; + return true; + } + if (ISL_DEV_GEN(dev) >= 6) { gen6_filter_tiling(dev, info, &tiling_flags); } else { @@ -264,8 +280,6 @@ isl_surf_choose_tiling(const struct isl_device *dev, CHOOSE(ISL_TILING_LINEAR); } - CHOOSE(ISL_TILING_CCS); - CHOOSE(ISL_TILING_HIZ); CHOOSE(ISL_TILING_Ys); CHOOSE(ISL_TILING_Yf); CHOOSE(ISL_TILING_Y0); diff --git a/src/intel/isl/isl_gen7.c b/src/intel/isl/isl_gen7.c index a2a9486211d..022dd866a74 100644 --- a/src/intel/isl/isl_gen7.c +++ b/src/intel/isl/isl_gen7.c @@ -217,24 +217,10 @@ gen6_filter_tiling(const struct isl_device *dev, *flags &= ~ISL_TILING_W_BIT; } - /* The HiZ format and tiling always go together */ - if (info->format == ISL_FORMAT_HIZ) { - *flags &= ISL_TILING_HIZ_BIT; - } else { - *flags &= ~ISL_TILING_HIZ_BIT; - } - /* MCS buffers are always Y-tiled */ if (isl_format_get_layout(info->format)->txc == ISL_TXC_MCS) *flags &= ISL_TILING_Y0_BIT; - /* The CCS formats and tiling always go together */ - if (isl_format_get_layout(info->format)->txc == ISL_TXC_CCS) { - *flags &= ISL_TILING_CCS_BIT; - } else { - *flags &= ~ISL_TILING_CCS_BIT; - } - if (info->usage & (ISL_SURF_USAGE_DISPLAY_ROTATE_90_BIT | ISL_SURF_USAGE_DISPLAY_ROTATE_180_BIT | ISL_SURF_USAGE_DISPLAY_ROTATE_270_BIT)) { -- 2.30.2