diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index 0ff6f8609ea..e9932d4ff46 100644
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -1148,20 +1148,17 @@ static struct si_texture *si_texture_create_object(struct pipe_screen *screen,
       tex->depth_clear_value[i] = 1.0;
 
    if (tex->surface.flags & RADEON_SURF_TC_COMPATIBLE_HTILE) {
+      assert(sscreen->info.gfx_level < GFX12);
+
       /* On GFX8, HTILE uses different tiling depending on the TC_COMPATIBLE_HTILE
        * setting, so we have to enable it if we enabled it at allocation.
        *
-       * GFX11 has Z corruption if we don't enable TC-compatible HTILE, see:
-       * https://gitlab.freedesktop.org/mesa/mesa/-/issues/11891
-       *
-       * GFX9 and later use the same tiling for both, so TC-compatible HTILE can be
+       * GFX9+ and later use the same tiling for both, so TC-compatible HTILE can be
        * enabled on demand.
        */
       tex->tc_compatible_htile = sscreen->info.gfx_level == GFX8 ||
-                                 sscreen->info.gfx_level >= GFX11 ||
                                  /* Mipmapping always starts TC-compatible. */
                                  (sscreen->info.gfx_level >= GFX9 &&
-                                  sscreen->info.gfx_level < GFX11 &&
                                   tex->buffer.b.b.last_level > 0);
    }