Mesa (master): freedreno: reduce extra height alignment in a6xx layout

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e49748521ec9182e8d2eec823182cc463709123f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e49748521ec9182e8d2eec823182cc463709123f

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Tue May 12 21:58:20 2020 -0400

freedreno: reduce extra height alignment in a6xx layout

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4611>

---

 src/freedreno/fdl/fd6_layout.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/freedreno/fdl/fd6_layout.c b/src/freedreno/fdl/fd6_layout.c
index 137ba42650e..ea71da8918f 100644
--- a/src/freedreno/fdl/fd6_layout.c
+++ b/src/freedreno/fdl/fd6_layout.c
@@ -169,14 +169,14 @@ fdl6_layout(struct fdl_layout *layout,
 			nblocksy = align(nblocksy, ta->heightalign);
 
 		/* The blits used for mem<->gmem work at a granularity of
-		 * 32x32, which can cause faults due to over-fetch on the
+		 * 16x4, which can cause faults due to over-fetch on the
 		 * last level.  The simple solution is to over-allocate a
 		 * bit the last level to ensure any over-fetch is harmless.
 		 * The pitch is already sufficiently aligned, but height
-		 * may not be:
+		 * may not be. note this only matters if last level is linear
 		 */
 		if (level == mip_levels - 1)
-			nblocksy = align(nblocksy, 32);
+			height = align(nblocksy, 4);
 
 		uint32_t nblocksx =
 			util_align_npot(util_format_get_nblocksx(format, u_minify(pitch0, level)),