From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Sun, 21 May 2017 21:40:54 +0000 (+0200)
Subject: ac/surface: Fix HTILE for radv.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ecdace80f4ec14b8a8a16554bcb8ed0b87144b97;p=mesa.git

ac/surface: Fix HTILE for radv.

We always compute HTILE size using addrlib, even when not TC compatible.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlied <airlied@redhat.com>
---

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index 51e15d07d3c..877d592ab81 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -331,10 +331,9 @@ static int gfx6_compute_level(ADDR_HANDLE addrlib,
 	/* TC-compatible HTILE. */
 	if (!is_stencil &&
 	    AddrSurfInfoIn->flags.depth &&
-	    AddrSurfInfoIn->flags.tcCompatible &&
 	    surf_level->mode == RADEON_SURF_MODE_2D &&
 	    level == 0) {
-		AddrHtileIn->flags.tcCompatible = 1;
+		AddrHtileIn->flags.tcCompatible = AddrSurfInfoIn->flags.tcCompatible;
 		AddrHtileIn->pitch = AddrSurfInfoOut->pitch;
 		AddrHtileIn->height = AddrSurfInfoOut->height;
 		AddrHtileIn->numSlices = AddrSurfInfoOut->depth;