From ee40162321f84e3a50b58c2dcf80689a702d1155 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Tue, 19 May 2026 08:41:31 -0400 Subject: [PATCH] intel/isl: Fix the initial state HiZ state for Xe2+ HSD 22011236099 actually states that there are no illegal values for HiZ for partial clear operations. Other operations (e.g., copies) may still result in corruption without a preceding ambiguate. Fixes: a13aab1859b ("intel/isl: Update the initial HiZ state for Xe2+") Related: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40987 Tested-by: Nataraj Deshpande Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/isl/isl_aux_info.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/intel/isl/isl_aux_info.c b/src/intel/isl/isl_aux_info.c index 79133d35e23..8bec41b8fe8 100644 --- a/src/intel/isl/isl_aux_info.c +++ b/src/intel/isl/isl_aux_info.c @@ -144,14 +144,7 @@ isl_aux_get_initial_state(const struct intel_device_info *devinfo, case ISL_AUX_USAGE_HIZ: case ISL_AUX_USAGE_HIZ_CCS: case ISL_AUX_USAGE_HIZ_CCS_WT: - if (devinfo->ver >= 20) { - /* According to HSD 22011236099, there are no illegal values for HiZ. - * As neither the main and aux surfaces contain anything of interest, - * treat them as being in sync. This state can avoid the need to - * ambiguate in some cases. - */ - return ISL_AUX_STATE_RESOLVED; - } else if (zeroed && devinfo->ver <= 11) { + if (zeroed && devinfo->ver <= 11) { /* On ICL and prior, fast-clearing a HiZ block fills it with zeroes. * On gfx12+, it is filled with a non-zero value. */