Revert "ac/surface: remove RADEON_SURF_TC_COMPATIBLE_HTILE and assume it's always...

This reverts commit f6d87ec8a908250af5e805c8042524ac360094a2.

It breaks RADV.

Fixes: f6d87ec8a908250af5e805c8042524ac360094a2 "ac/surface: remove RADEON_SURF_TC_COMPATIBLE_HTILE and assume it's always set"
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4864>

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index ef266922564d6baceba45277965ec66a375a3c68..474be97d0b4003af75e0e5c8345f3e679742a72a 100644 (file)
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -651,8 +651,7 @@ static int gfx6_compute_surface(ADDR_HANDLE addrlib,
        AddrSurfInfoIn.flags.cube = config->is_cube;
        AddrSurfInfoIn.flags.display = get_display_flag(config, surf);
        AddrSurfInfoIn.flags.pow2Pad = config->info.levels > 1;
-       AddrSurfInfoIn.flags.tcCompatible = info->chip_class >= GFX8 &&
-                                           AddrSurfInfoIn.flags.depth;
+       AddrSurfInfoIn.flags.tcCompatible = (surf->flags & RADEON_SURF_TC_COMPATIBLE_HTILE) != 0;
 
        /* Only degrade the tile mode for space if TC-compatible HTILE hasn't been
         * requested, because TC-compatible HTILE requires 2D tiling.
@@ -773,7 +772,6 @@ static int gfx6_compute_surface(ADDR_HANDLE addrlib,
        surf->htile_size = 0;
        surf->htile_slice_size = 0;
        surf->htile_alignment = 1;
-       surf->tc_compatible_htile_allowed = AddrSurfInfoIn.flags.tcCompatible;
 
        const bool only_stencil = (surf->flags & RADEON_SURF_SBUFFER) &&
                                  !(surf->flags & RADEON_SURF_ZBUFFER);
@@ -790,11 +788,10 @@ static int gfx6_compute_surface(ADDR_HANDLE addrlib,
                        if (level > 0)
                                continue;
 
-                       if (!AddrSurfInfoOut.tcCompatible)
+                       if (!AddrSurfInfoOut.tcCompatible) {
                                AddrSurfInfoIn.flags.tcCompatible = 0;
-
-                       if (!AddrSurfInfoOut.tcCompatible || !surf->htile_size)
-                               surf->tc_compatible_htile_allowed = false;
+                               surf->flags &= ~RADEON_SURF_TC_COMPATIBLE_HTILE;
+                       }
 
                        if (AddrSurfInfoIn.flags.matchStencilTileCfg) {
                                AddrSurfInfoIn.flags.matchStencilTileCfg = 0;
@@ -940,7 +937,7 @@ static int gfx6_compute_surface(ADDR_HANDLE addrlib,
         * TC-compatible HTILE even for levels where it's disabled by DB.
         */
        if (surf->htile_size && config->info.levels > 1 &&
-           surf->tc_compatible_htile_allowed) {
+           surf->flags & RADEON_SURF_TC_COMPATIBLE_HTILE) {
                /* MSAA can't occur with levels > 1, so ignore the sample count. */
                const unsigned total_pixels = surf->surf_size / surf->bpe;
                const unsigned htile_block_size = 8 * 8;
@@ -1572,12 +1569,14 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib,
                AddrSurfInfoIn.bpp = surf->bpe * 8;
        }
 
-       AddrSurfInfoIn.flags.color = !(surf->flags & RADEON_SURF_Z_OR_SBUFFER) &&
+       bool is_color_surface = !(surf->flags & RADEON_SURF_Z_OR_SBUFFER);
+       AddrSurfInfoIn.flags.color = is_color_surface &&
                                     !(surf->flags & RADEON_SURF_NO_RENDER_TARGET);
        AddrSurfInfoIn.flags.depth = (surf->flags & RADEON_SURF_ZBUFFER) != 0;
        AddrSurfInfoIn.flags.display = get_display_flag(config, surf);
        /* flags.texture currently refers to TC-compatible HTILE */
-       AddrSurfInfoIn.flags.texture = 1;
+       AddrSurfInfoIn.flags.texture = is_color_surface ||
+                                      surf->flags & RADEON_SURF_TC_COMPATIBLE_HTILE;
        AddrSurfInfoIn.flags.opt4space = 1;
 
        AddrSurfInfoIn.numMipLevels = config->info.levels;
@@ -1717,7 +1716,6 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib,
        }
 
        surf->is_linear = surf->u.gfx9.surf.swizzle_mode == ADDR_SW_LINEAR;
-       surf->tc_compatible_htile_allowed = surf->htile_size != 0;
 
        /* Query whether the surface is displayable. */
        /* This is only useful for surfaces that are allocated without SCANOUT. */

diff --git a/src/amd/common/ac_surface.h b/src/amd/common/ac_surface.h
index bd90d958ea2e914d88cb8afe56563e67f890a25b..8fbf7488c4a0a1c6e36176fa5467411c655e07ee 100644 (file)
--- a/src/amd/common/ac_surface.h
+++ b/src/amd/common/ac_surface.h
@@ -67,7 +67,7 @@ enum radeon_micro_mode {
 /* bits 19 and 20 are reserved for libdrm_radeon, don't use them */
 #define RADEON_SURF_FMASK                       (1 << 21)
 #define RADEON_SURF_DISABLE_DCC                 (1 << 22)
-/* gap */
+#define RADEON_SURF_TC_COMPATIBLE_HTILE         (1 << 23)
 #define RADEON_SURF_IMPORTED                    (1 << 24)
 /* gap */
 #define RADEON_SURF_SHAREABLE                   (1 << 26)
@@ -198,7 +198,6 @@ struct radeon_surf {
     unsigned                    has_stencil:1;
     /* This might be true even if micro_tile_mode isn't displayable or rotated. */
     unsigned                    is_displayable:1;
-    unsigned                    tc_compatible_htile_allowed:1;
     /* Displayable, thin, depth, rotated. AKA D,S,Z,R swizzle modes. */
     unsigned                    micro_tile_mode:3;
     uint32_t                    flags;

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 84eae33f4333e9268215964114ddfe8c69e850b2..f7818c691c864b82e829124cf5aa2668a59dcb38 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -437,8 +437,11 @@ radv_init_surface(struct radv_device *device,
                unreachable("unhandled image type");
        }
 
-       if (is_depth)
+       if (is_depth) {
                surface->flags |= RADEON_SURF_ZBUFFER;
+               if (radv_use_tc_compat_htile_for_image(device, pCreateInfo, image_format))
+                       surface->flags |= RADEON_SURF_TC_COMPATIBLE_HTILE;
+       }
 
        if (is_stencil)
                surface->flags |= RADEON_SURF_SBUFFER;
@@ -1348,8 +1351,6 @@ static void radv_image_disable_htile(struct radv_image *image)
 {
        for (unsigned i = 0; i < image->plane_count; ++i)
                image->planes[i].surface.htile_size = 0;
-
-       image->tc_compatible_htile = false;
 }
 
 VkResult
@@ -1421,8 +1422,7 @@ radv_image_create_layout(struct radv_device *device,
                        /* Otherwise, try to enable HTILE for depth surfaces. */
                        if (radv_image_can_enable_htile(image) &&
                            !(device->instance->debug_flags & RADV_DEBUG_NO_HIZ)) {
-                               if (!image->planes[0].surface.tc_compatible_htile_allowed)
-                                       image->tc_compatible_htile = false;
+                               image->tc_compatible_htile = image->planes[0].surface.flags & RADEON_SURF_TC_COMPATIBLE_HTILE;
                                radv_image_alloc_htile(device, image);
                        } else {
                                radv_image_disable_htile(image);
@@ -1500,10 +1500,6 @@ radv_image_create(VkDevice _device,
                image->info.surf_index = &device->image_mrt_offset_counter;
        }
 
-       image->tc_compatible_htile =
-               radv_use_tc_compat_htile_for_image(device, create_info->vk_info,
-                                                  image->vk_format);
-
        for (unsigned plane = 0; plane < image->plane_count; ++plane) {
                radv_init_surface(device, image, &image->planes[plane].surface, plane, pCreateInfo, format);
        }

diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index c1cf4c868937410ccd3329046036100be42edca9..9914b2148646a561251f5e843fb580d5c3de7e3a 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -241,6 +241,8 @@ static int si_init_surface(struct si_screen *sscreen, struct radeon_surf *surfac
           */
          if (sscreen->info.chip_class == GFX8)
             bpe = 4;
+
+         flags |= RADEON_SURF_TC_COMPATIBLE_HTILE;
       }
 
       if (is_stencil)
@@ -1186,8 +1188,7 @@ static struct si_texture *si_texture_create_object(struct pipe_screen *screen,
                                                    const struct radeon_surf *surface,
                                                    const struct si_texture *plane0,
                                                    struct pb_buffer *imported_buf, uint64_t offset,
-                                                   uint64_t alloc_size, unsigned alignment,
-                                                   bool tc_compatible_htile)
+                                                   uint64_t alloc_size, unsigned alignment)
 {
    struct si_texture *tex;
    struct si_resource *resource;
@@ -1206,8 +1207,8 @@ static struct si_texture *si_texture_create_object(struct pipe_screen *screen,
    /* don't include stencil-only formats which we don't support for rendering */
    tex->is_depth = util_format_has_depth(util_format_description(tex->buffer.b.b.format));
    tex->surface = *surface;
-   tex->tc_compatible_htile = tex->surface.tc_compatible_htile_allowed &&
-                              tc_compatible_htile;
+   tex->tc_compatible_htile =
+      tex->surface.htile_size != 0 && (tex->surface.flags & RADEON_SURF_TC_COMPATIBLE_HTILE);
 
    /* TC-compatible HTILE:
     * - GFX8 only supports Z32_FLOAT.
@@ -1568,8 +1569,7 @@ struct pipe_resource *si_texture_create(struct pipe_screen *screen,
    for (unsigned i = 0; i < num_planes; i++) {
       struct si_texture *tex =
          si_texture_create_object(screen, &plane_templ[i], &surface[i], plane0, NULL,
-                                  plane_offset[i], total_size, max_alignment,
-                                  tc_compatible_htile);
+                                  plane_offset[i], total_size, max_alignment);
       if (!tex) {
          si_texture_reference(&plane0, NULL);
          return NULL;
@@ -1641,7 +1641,7 @@ static struct pipe_resource *si_texture_from_winsys_buffer(struct si_screen *ssc
    if (r)
       return NULL;
 
-   tex = si_texture_create_object(&sscreen->b, templ, &surface, NULL, buf, offset, 0, 0, false);
+   tex = si_texture_create_object(&sscreen->b, templ, &surface, NULL, buf, offset, 0, 0);
    if (!tex)
       return NULL;