fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 21:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel/isl: Enable a 64KB alignment WA for flat-CCS

Browse source 
WA 22015614752 applies to gfx125 platforms, but the alignment
requirement was only enabled for the subset that has an aux-map. Adjust
the condition to apply it where appropriate.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28284>
This commit is contained in:
Nanley Chery 2024-03-12 15:26:09 -04:00 • committed by Marge Bot
parent d7bfa8051e
commit b092124186
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/intel/isl/isl.c
View file

@ -2662,8 +2662,7 @@ isl_calc_base_alignment(const struct isl_device *dev,
if (tile_info->tiling == ISL_TILING_GFX12_CCS)
base_alignment_B = MAX(base_alignment_B, 4096);
if (dev->info->has_aux_map &&
isl_format_supports_ccs_e(dev->info, info->format) &&
if (isl_format_supports_ccs_e(dev->info, info->format) &&
!INTEL_DEBUG(DEBUG_NO_CCS) &&
!(info->usage & ISL_SURF_USAGE_DISABLE_AUX_BIT)) {
/* Wa_22015614752:
@ -2698,7 +2697,8 @@ isl_calc_base_alignment(const struct isl_device *dev,
* is that we haven't enable CCS on linear images yet so we can avoid
* the extra alignment there.
*/
if (!(info->usage & ISL_SURF_USAGE_NO_AUX_TT_ALIGNMENT_BIT)) {
if (dev->info->has_aux_map &&
!(info->usage & ISL_SURF_USAGE_NO_AUX_TT_ALIGNMENT_BIT)) {
base_alignment_B = MAX(base_alignment_B, dev->info->verx10 >= 125 ?
1024 * 1024 : 64 * 1024);
}