diff options
| author | Lionel Landwerlin <[email protected]> | 2020-02-20 16:16:33 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-03-19 19:17:10 +0000 |
| commit | def3470e9bc1c3c4d93b21cf15b7105e4f553dab (patch) | |
| tree | e39c80a36b02403b1132cec2884b4b4f88e7738c /src/intel | |
| parent | dab0aadea9494ebf19a0c3e23a38bd01c857b49c (diff) | |
isl: only apply main surface ccs pitch constraint with CCS
We could be creating a Y-tiled surface that isn't going to use CCS
(this could be the case when clearly indicated through modifiers).
Don't apply the main surface pitch alignment constraint in that case.
v2: Use logical NOT (Sagar)
Signed-off-by: Lionel Landwerlin <[email protected]>
Fixes: a3f6db2c4e92 ("isl: drop CCS row pitch requirement for linear surfaces")
Reviewed-by: Nanley Chery <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4243>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/isl/isl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 877dd8a1cdb..c6db6fb00b8 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -1375,7 +1375,8 @@ isl_calc_row_pitch_alignment(const struct isl_device *dev, */ if (ISL_DEV_GEN(dev) >= 12 && isl_format_supports_ccs_e(dev->info, surf_info->format) && - tile_info->tiling != ISL_TILING_X) { + tile_info->tiling != ISL_TILING_X && + !(surf_info->usage & ISL_SURF_USAGE_DISABLE_AUX_BIT)) { return isl_align(tile_info->phys_extent_B.width, 512); } |