KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "isl: Don't filter tiling flags if a specific tiling bit is set" 

This reverts commit 091f1da902 .

Although a user may specify a specfic tiling bit, ISL should still
prevent incompatible tiling/surface combinations.

Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Chad Versace <chad.versace@intel.com>
This commit is contained in:
Nanley Chery 2016-06-24 16:06:31 -07:00
parent e179fee049
commit 1fc739d28e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/intel/isl/isl.c
View File

@ -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) \