From f74dda9377b150d6a97b9e121f3a23ef6aa1a7a4 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Tue, 22 Dec 2020 15:33:23 -0500
Subject: [PATCH] pan/bi: Move bi_constants to bifrost.h

Although it's software-defined, this stems from architectural traits and
is useful in both the disasm and the compiler.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8723>
---
 src/panfrost/bifrost/bifrost.h     | 15 +++++++++++++++
 src/panfrost/bifrost/disassemble.h | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/panfrost/bifrost/bifrost.h b/src/panfrost/bifrost/bifrost.h
index d9a78b3c65a..c59692e548b 100644
--- a/src/panfrost/bifrost/bifrost.h
+++ b/src/panfrost/bifrost/bifrost.h
@@ -502,4 +502,19 @@ struct bifrost_pixel_indices {
         unsigned y : 8;
 } __attribute__((packed));
 
+enum bi_constmod {
+        BI_CONSTMOD_NONE,
+        BI_CONSTMOD_PC_LO,
+        BI_CONSTMOD_PC_HI,
+        BI_CONSTMOD_PC_LO_HI
+};
+
+struct bi_constants {
+        /* Raw constant values */
+        uint64_t raw[6];
+
+        /* Associated modifier derived from M values */
+        enum bi_constmod mods[6];
+};
+
 #endif
diff --git a/src/panfrost/bifrost/disassemble.h b/src/panfrost/bifrost/disassemble.h
index f63e04f254e..6eb37260868 100644
--- a/src/panfrost/bifrost/disassemble.h
+++ b/src/panfrost/bifrost/disassemble.h
@@ -34,21 +34,6 @@
 
 void disassemble_bifrost(FILE *fp, uint8_t *code, size_t size, bool verbose);
 
-enum bi_constmod {
-        BI_CONSTMOD_NONE,
-        BI_CONSTMOD_PC_LO,
-        BI_CONSTMOD_PC_HI,
-        BI_CONSTMOD_PC_LO_HI
-};
-
-struct bi_constants {
-        /* Raw constant values */
-        uint64_t raw[6];
-
-        /* Associated modifier derived from M values */
-        enum bi_constmod mods[6];
-};
-
 void
 bi_disasm_fma(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bifrost_regs *next_regs, unsigned staging_register, unsigned branch_offset, struct bi_constants *consts, bool first);