[Mesa-dev] [PATCH 14/14] winsys/amdgpu: avoid flushed depth when possible

[Nicolai Hähnle]

From: Nicolai Hähnle <nicolai.haehnle at amd.com>

If a depth/stencil texture has no mipmaps, we can always get a layout that is
compatible with DB and TC.
---
 src/gallium/winsys/amdgpu/drm/amdgpu_surface.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c b/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
index cafa75d..66a3534 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
@@ -373,10 +373,15 @@ static int amdgpu_surface_init(struct radeon_winsys *rws,
    AddrSurfInfoIn.flags.noStencil = (surf->flags & RADEON_SURF_SBUFFER) == 0;
    AddrSurfInfoIn.flags.compressZ = AddrSurfInfoIn.flags.depth;
 
-   /* TODO: update addrlib to a newer version, remove this, and
-    * set flags.matchStencilTileCfg = 1 to fix stencil texturing.
+   /* noStencil = 0 can result in a depth part that is incompatible with
+    * texturing. So set noStencil = 1 when mipmaps are requested (in this case,
+    * we end up setting stencil_adjusted when required).
+    *
+    * TODO: update addrlib to a newer version, remove this, and
+    * use flags.matchStencilTileCfg = 1 as an alternative fix.
     */
-   AddrSurfInfoIn.flags.noStencil = 1;
+  if (surf->last_level > 0)
+      AddrSurfInfoIn.flags.noStencil = 1;
 
    /* Set preferred macrotile parameters. This is usually required
     * for shared resources. This is for 2D tiling only. */
-- 
2.7.4