From 50243892b4232e4d26c7d00bd86b88da01fad25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Wed, 13 Nov 2024 14:22:46 +0200 Subject: [PATCH] isl: modify existing assert by allowing CCS_E aux usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Relax this assert based on x/y offsets for GFX_VERx10 >= 200. This is getting hit when running gfxbench5 on LNL/BMG. Signed-off-by: Tapani Pälli Reviewed-by: Nanley Chery Reviewed-by: Jianxun Zhang Part-of: --- src/intel/isl/isl_surface_state.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c index da9ef366afe..e025a4b4403 100644 --- a/src/intel/isl/isl_surface_state.c +++ b/src/intel/isl/isl_surface_state.c @@ -639,16 +639,16 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, assert(isl_is_pow2(isl_format_get_layout(info->view->format)->bpb)); assert(info->surf->levels == 1); assert(info->surf->logical_level0_px.array_len == 1); - assert(info->aux_usage == ISL_AUX_USAGE_NONE); - if (GFX_VER >= 8) { - /* Broadwell added more rules. */ - assert(info->surf->samples == 1); - if (isl_format_get_layout(info->view->format)->bpb == 8) - assert(info->x_offset_sa % 16 == 0); - if (isl_format_get_layout(info->view->format)->bpb == 16) - assert(info->x_offset_sa % 8 == 0); - } +#if GFX_VER >= 8 + /* Broadwell added more rules. */ + assert(info->surf->samples == 1); + assert(isl_encode_aux_mode[info->aux_usage] == AUX_NONE); + if (isl_format_get_layout(info->view->format)->bpb == 8) + assert(info->x_offset_sa % 16 == 0); + if (isl_format_get_layout(info->view->format)->bpb == 16) + assert(info->x_offset_sa % 8 == 0); +#endif #if GFX_VER >= 7 s.SurfaceArray = false;