From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 28 Aug 2018 19:49:31 +0000 (-0400)
Subject: radeonsi: fix HTILE for NPOT textures with mipmapping on SI/CI
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a1b9a00f82db79e59e4a743d52bb62c998584690;p=mesa.git

radeonsi: fix HTILE for NPOT textures with mipmapping on SI/CI

VI uses addrlib so it's unaffected.

Cc: 18.1 18.2 <mesa-stable@lists.freedesktop.org>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
---

diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index e55fd815264..bcff226a586 100644
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -931,8 +931,8 @@ static void si_texture_get_htile_size(struct si_screen *sscreen,
 		return;
 	}
 
-	width = align(tex->buffer.b.b.width0, cl_width * 8);
-	height = align(tex->buffer.b.b.height0, cl_height * 8);
+	width = align(tex->surface.u.legacy.level[0].nblk_x, cl_width * 8);
+	height = align(tex->surface.u.legacy.level[0].nblk_y, cl_height * 8);
 
 	slice_elements = (width * height) / (8 * 8);
 	slice_bytes = slice_elements * 4;