Mesa (master): etnaviv: check NO_ASTC feature bit

[GitLab Mirror]

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

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Fri Aug  9 11:44:07 2019 -0400

etnaviv: check NO_ASTC feature bit

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Reviewed-by: Lucas Stach <l.stach at pengutronix.de>

---

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

diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index 7feb0cd6831..7c7d1d32e54 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -752,7 +752,8 @@ etna_get_specs(struct etna_screen *screen)
    if (screen->specs.single_buffer)
       DBG("etnaviv: Single buffer mode enabled with %d pixel pipes", screen->specs.pixel_pipes);
 
-   screen->specs.tex_astc = VIV_FEATURE(screen, chipMinorFeatures4, TEXTURE_ASTC);
+   screen->specs.tex_astc = VIV_FEATURE(screen, chipMinorFeatures4, TEXTURE_ASTC) &&
+                            !VIV_FEATURE(screen, chipMinorFeatures6, NO_ASTC);
 
    screen->specs.use_blt = VIV_FEATURE(screen, chipMinorFeatures5, BLT_ENGINE);