Mesa (main): freedreno/a6xx: larger gmem_page_align from tile align instead of gpu id

[GitLab Mirror]

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

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Wed May 19 21:56:53 2021 -0400

freedreno/a6xx: larger gmem_page_align from tile align instead of gpu id

The larger page alignment is directly related to the 96 tile alignment,
so check for that instead of a specific gpu id.

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11790>

---

 src/gallium/drivers/freedreno/freedreno_gmem.c   | 2 +-
 src/gallium/drivers/freedreno/freedreno_screen.h | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_gmem.c b/src/gallium/drivers/freedreno/freedreno_gmem.c
index 4af7d060b22..4fec1707b9c 100644
--- a/src/gallium/drivers/freedreno/freedreno_gmem.c
+++ b/src/gallium/drivers/freedreno/freedreno_gmem.c
@@ -516,7 +516,7 @@ gmem_key_init(struct fd_batch *batch, bool assume_zs, bool no_scis_opt)
        */
       key->gmem_page_align = 8;
    } else if (is_a6xx(screen)) {
-      key->gmem_page_align = is_a650(screen) ? 3 : 1;
+      key->gmem_page_align = (screen->info.tile_align_w == 96) ? 3 : 1;
    } else {
       // TODO re-check this across gens.. maybe it should only
       // be a single page in some cases:
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.h b/src/gallium/drivers/freedreno/freedreno_screen.h
index d5945085427..fb17ddf1a67 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.h
+++ b/src/gallium/drivers/freedreno/freedreno_screen.h
@@ -223,12 +223,6 @@ is_a6xx(struct fd_screen *screen)
    return (screen->gpu_id >= 600) && (screen->gpu_id < 700);
 }
 
-static inline boolean
-is_a650(struct fd_screen *screen)
-{
-   return screen->gpu_id == 650;
-}
-
 /* is it using the ir3 compiler (shader isa introduced with a3xx)? */
 static inline boolean
 is_ir3(struct fd_screen *screen)