From 6fc0e5c0aa008cc76785106d598584dd1eef8f01 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Mon, 13 Oct 2025 23:03:27 -0400 Subject: [PATCH] blorp: Fix Tile64 clear redescription assertion Prevent assert failures in a future commit where Tile64 will be selected more often. Fixes: 42ef23ecd1a ("intel/blorp: Don't redescribe some Tile64 clears") Reviewed-by: Rohan Garg Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/blorp/blorp_clear.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c index 329161da55b..8e4b9b45e7d 100644 --- a/src/intel/blorp/blorp_clear.c +++ b/src/intel/blorp/blorp_clear.c @@ -550,14 +550,11 @@ blorp_fast_clear(struct blorp_batch *batch, size_B = end_tile_B - start_tile_B; addr.offset += start_tile_B; } else if (isl_tiling_is_64(surf->surf->tiling)) { - /* If not supported above, clear the range without redescription. If - * the image is 3D, redescription is not possible because multiple - * depth slices are non-trivially interleaved into one plane. If the - * image is part of a miptail, there should be no benefit from - * redescription. + /* If not supported above, clear the range without redescription. + * Thankfully, we haven't run into this outside of conformance tests. */ - assert(surf->surf->logical_level0_px.d > 1 || - level <= surf->surf->miptail_start_level); + assert(surf->surf->levels > 1 || + surf->surf->logical_level0_px.d != num_layers); } else if (level == 0 && start_layer == 0 && num_layers == 1) { assert(surf->surf->tiling == ISL_TILING_4 || surf->surf->tiling == ISL_TILING_Y0);