From: Marek Olšák <marek.ol...@amd.com>

---
 src/amd/common/ac_surface.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index 7558dd91e34..c209b209da2 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -344,24 +344,36 @@ static int gfx6_compute_level(ADDR_HANDLE addrlib,
                AddrDccIn->tileInfo = *AddrSurfInfoOut->pTileInfo;
                AddrDccIn->tileIndex = AddrSurfInfoOut->tileIndex;
                AddrDccIn->macroModeIndex = AddrSurfInfoOut->macroModeIndex;
 
                ret = AddrComputeDccInfo(addrlib,
                                         AddrDccIn,
                                         AddrDccOut);
 
                if (ret == ADDR_OK) {
                        surf_level->dcc_offset = surf->dcc_size;
-                       surf_level->dcc_fast_clear_size = 
AddrDccOut->dccFastClearSize;
                        surf->num_dcc_levels = level + 1;
                        surf->dcc_size = surf_level->dcc_offset + 
AddrDccOut->dccRamSize;
                        surf->dcc_alignment = MAX2(surf->dcc_alignment, 
AddrDccOut->dccRamBaseAlign);
+
+                       /* If the DCC size of a subresource (1 mip level or 1 
slice)
+                        * is not aligned, the DCC memory layout is not 
contiguous for
+                        * that subresource, which means we can't use fast 
clear.
+                        *
+                        * We only do fast clears for whole mipmap levels. If 
we did
+                        * per-slice fast clears, the same restriction would 
apply.
+                        * (i.e. only compute the slice size and see if it's 
aligned)
+                        */
+                       if (level == config->info.levels - 1 || 
AddrDccOut->dccRamSizeAligned)
+                               surf_level->dcc_fast_clear_size = 
AddrDccOut->dccFastClearSize;
+                       else
+                               surf_level->dcc_fast_clear_size = 0;
                }
        }
 
        /* TC-compatible HTILE. */
        if (!is_stencil &&
            AddrSurfInfoIn->flags.depth &&
            surf_level->mode == RADEON_SURF_MODE_2D &&
            level == 0) {
                AddrHtileIn->flags.tcCompatible = 
AddrSurfInfoIn->flags.tcCompatible;
                AddrHtileIn->pitch = AddrSurfInfoOut->pitch;
-- 
2.17.0

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to