Mesa (main): etnaviv: don't supertile textures if supertiling is disabled via debug option

[GitLab Mirror]

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

Author: Lucas Stach <l.stach at pengutronix.de>
Date:   Thu Jan 21 15:50:38 2021 +0100

etnaviv: don't supertile textures if supertiling is disabled via debug option

The debug option only disables the general can_supertile spec of the GPU, so
we should also take this into account when deciding about the layout of a
sampler resource.

Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel at pengutronix.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9255>

---

 src/gallium/drivers/etnaviv/etnaviv_resource.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c
index 6f77b829151..20e0c730f1e 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_resource.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c
@@ -348,7 +348,8 @@ etna_resource_create(struct pipe_screen *pscreen,
          layout |= ETNA_LAYOUT_BIT_MULTI;
       if (screen->specs.can_supertile)
          layout |= ETNA_LAYOUT_BIT_SUPER;
-   } else if (VIV_FEATURE(screen, chipMinorFeatures2, SUPERTILED_TEXTURE) &&
+   } else if (screen->specs.can_supertile &&
+              VIV_FEATURE(screen, chipMinorFeatures2, SUPERTILED_TEXTURE) &&
               etna_resource_hw_tileable(screen->specs.use_blt, templat)) {
       layout |= ETNA_LAYOUT_BIT_SUPER;
    }