Module: Mesa Branch: staging/23.3 Commit: 3690c58d7af8c925bcd3ddf08972dcd9d8232750 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3690c58d7af8c925bcd3ddf08972dcd9d8232750
Author: Lionel Landwerlin <[email protected]> Date: Wed Dec 27 22:20:22 2023 +0200 isl: implement Wa_22015614752 This workaround requires 64Kb alignment for compression with multiple engine accesses. Signed-off-by: Lionel Landwerlin <[email protected]> Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8614 Reviewed-by: Jianxun Zhang <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26890> (cherry picked from commit f12ffc6b0486944c362760e70eb1774cd4fe1950) --- .pick_status.json | 2 +- src/intel/isl/isl.c | 43 +++++++++++++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 19ec078c0c2..1c19b74180e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -114,7 +114,7 @@ "description": "isl: implement Wa_22015614752", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index e8216ae138f..cddf55229b5 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -2548,19 +2548,42 @@ 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); - /* Platforms using an aux map require that images be granularity-aligned - * if they're going to used with CCS. This is because the Aux - * translation table maps main surface addresses to aux addresses at a - * granularity in the main surface. Because we don't know for sure in - * ISL if a surface will use CCS, we have to guess based on the - * DISABLE_AUX usage bit. The one thing we do know is that we haven't - * enable CCS on linear images yet so we can avoid the extra alignment - * there. - */ if (dev->info->has_aux_map && !(info->usage & ISL_SURF_USAGE_DISABLE_AUX_BIT)) { + /* Wa_22015614752: + * + * Due to L3 cache being tagged with (engineID, vaID) and the CCS + * block/cacheline being 256 bytes, 2 engines accessing a 64Kb range + * with compression will generate 2 different CCS cacheline entries + * in L3, this will lead to corruptions. To avoid this, we need to + * ensure 2 images do not share a 256 bytes CCS cacheline. With a + * ratio of compression of 1/256, this is 64Kb alignment (even for + * Tile4...) + * + * ATS-M PRMS, Vol 2a: Command Reference: Instructions, + * XY_CTRL_SURF_COPY_BLT, "Size of Control Surface Copy" field, the + * CCS blocks are 256 bytes : + * + * "This field indicates size of the Control Surface or CCS copy. + * It is expressed in terms of number of 256B block of CCS, where + * each 256B block of CCS corresponds to 64KB of main surface." + */ + if (intel_needs_workaround(dev->info, 22015614752)) { + base_alignment_B = MAX(base_alignment_B, + 256 /* cacheline */ * 256 /* AUX ratio */); + } + + /* Platforms using an aux map require that images be + * granularity-aligned if they're going to used with CCS. This is + * because the Aux translation table maps main surface addresses to + * aux addresses at a granularity in the main surface. Because we + * don't know for sure in ISL if a surface will use CCS, we have to + * guess based on the DISABLE_AUX usage bit. The one thing we do know + * is that we haven't enable CCS on linear images yet so we can avoid + * the extra alignment there. + */ base_alignment_B = MAX(base_alignment_B, dev->info->verx10 >= 125 ? - 1024 * 1024 : 64 * 1024); + 1024 * 1024 : 64 * 1024); } }
