From 1fc739d28ee91c688c48901781a5198b6eb5833d Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Fri, 24 Jun 2016 16:06:31 -0700 Subject: [PATCH] Revert "isl: Don't filter tiling flags if a specific tiling bit is set" This reverts commit 091f1da902c71ac8d3d27b325a118e2f683f1ae5 . Although a user may specify a specfic tiling bit, ISL should still prevent incompatible tiling/surface combinations. Signed-off-by: Nanley Chery Reviewed-by: Chad Versace --- src/intel/isl/isl.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 48ff8ce15c5..75b81189788 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -223,14 +223,11 @@ isl_surf_choose_tiling(const struct isl_device *dev, { isl_tiling_flags_t tiling_flags = info->tiling_flags; - /* Filter if multiple tiling options are given */ - if (!isl_is_pow2(tiling_flags)) { - if (ISL_DEV_GEN(dev) >= 7) { - gen7_filter_tiling(dev, info, &tiling_flags); - } else { - isl_finishme("%s: gen%u", __func__, ISL_DEV_GEN(dev)); - gen7_filter_tiling(dev, info, &tiling_flags); - } + if (ISL_DEV_GEN(dev) >= 7) { + gen7_filter_tiling(dev, info, &tiling_flags); + } else { + isl_finishme("%s: gen%u", __func__, ISL_DEV_GEN(dev)); + gen7_filter_tiling(dev, info, &tiling_flags); } #define CHOOSE(__tiling) \ -- 2.30.2