From 9654aa4c31d58d9641a45448950e9cdae824d750 Mon Sep 17 00:00:00 2001 From: Jianxun Zhang Date: Mon, 13 May 2024 21:25:05 -0700 Subject: [PATCH] intel/isl: Allow multi-sample on depth aux usage (xe2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The restriction on depth aux mode is gone on Xe2 in spec. Fix: piglit arb_post_depth_coverage-multisampling -auto -fbo isl_surface_state.c:723: isl_gfx20_surf_fill_state_s: Assertion `info->surf->samples == 1' failed. Signed-off-by: Jianxun Zhang Reviewed-by: José Roberto de Souza Part-of: --- src/intel/isl/isl_surface_state.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c index f3516fe9bb2..5a69a295a98 100644 --- a/src/intel/isl/isl_surface_state.c +++ b/src/intel/isl/isl_surface_state.c @@ -718,8 +718,13 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, * ISL_MSAA_LAYOUT_INTERLEAVED which is incompatible with MCS * compression, this means that we can't even specify MSAA depth CCS * in RENDER_SURFACE_STATE::AuxiliarySurfaceMode. + * + * On Xe2+, the above restriction is not mentioned in the + * RENDER_SURFACE_STATE::AuxiliarySurfaceMode. + * + * Bspec 57023 (r58975) */ - assert(info->surf->samples == 1); + assert(GFX_VER >= 20 || info->surf->samples == 1); /* Prior to Gfx12, the dimension must not be 3D */ if (info->aux_usage == ISL_AUX_USAGE_HIZ)