Mesa (master): panfrost: Advertise Bifrost support

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Sun Nov  1 09:11:09 2020 -0500

panfrost: Advertise Bifrost support

Drop the PAN_MESA_DEBUG=bifrost flag. Load on Bifrost chips by default.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7408>

---

 src/gallium/drivers/panfrost/pan_screen.c | 7 +------
 src/panfrost/lib/pan_util.h               | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 2920da4306f..1ac77c18ea2 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -64,7 +64,6 @@ static const struct debug_named_value debug_options[] = {
         {"precompile", PAN_DBG_PRECOMPILE, "Precompile shaders for shader-db"},
         {"fp16",     PAN_DBG_FP16,     "Enable 16-bit support"},
         {"nofp16",     PAN_DBG_NOFP16,     "Disable 16-bit support"},
-        {"bifrost",   PAN_DBG_BIFROST, "Enable experimental Mali G31 and G52 support"},
         {"gl3",       PAN_DBG_GL3,      "Enable experimental GL 3.x implementation, up to 3.3"},
         {"noafbc",    PAN_DBG_NO_AFBC,  "Disable AFBC support"},
         DEBUG_NAMED_VALUE_END
@@ -730,14 +729,10 @@ panfrost_create_screen(int fd, struct renderonly *ro)
         case 0x750: /* T760 */
         case 0x820: /* T820 */
         case 0x860: /* T860 */
-                break;
         case 0x6221: /* G72 */
         case 0x7093: /* G31 */
         case 0x7212: /* G52 */
-                if (dev->debug & PAN_DBG_BIFROST)
-                        break;
-
-                /* fallthrough */
+                break;
         default:
                 /* Fail to load against untested models */
                 debug_printf("panfrost: Unsupported model %X", dev->gpu_id);
diff --git a/src/panfrost/lib/pan_util.h b/src/panfrost/lib/pan_util.h
index c44808e762e..f893cf62c57 100644
--- a/src/panfrost/lib/pan_util.h
+++ b/src/panfrost/lib/pan_util.h
@@ -35,7 +35,7 @@
 #define PAN_DBG_SYNC            0x0010
 #define PAN_DBG_PRECOMPILE      0x0020
 #define PAN_DBG_NOFP16          0x0040
-#define PAN_DBG_BIFROST         0x0080
+/* 0x80 unused */
 #define PAN_DBG_GL3             0x0100
 #define PAN_DBG_NO_AFBC         0x0200
 #define PAN_DBG_FP16            0x0400