freedreno/a5xx: fix page faults on last level

We could alternatively fall back to using "old style" draw's for
mem<->gmem (ie. what <= a4xx do) when height is not aligned to 32,
but that is somewhat more work (and not really something that could
be applied to stable)

Cc: "18.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_resource.c b/src/gallium/drivers/freedreno/a5xx/fd5_resource.c
index 12ee6d76fc2b0a34023a3cdd130cbbeee389c23a..84fa64cec84f1f06b8b91a0440ab4b7f08ce4006 100644 (file)
--- a/src/gallium/drivers/freedreno/a5xx/fd5_resource.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_resource.c
@@ -73,6 +73,16 @@ setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format forma
                        aligned_height = align(aligned_height, heightalign);
                } else {
                        pitchalign = 64;
+
+                       /* The blits used for mem<->gmem work at a granularity of
+                        * 32x32, 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:
+                        */
+                       if (level == prsc->last_level)
+                               aligned_height = align(aligned_height, 32);
                }
 
                if (layout == UTIL_FORMAT_LAYOUT_ASTC)