From 0af37552a72d8c17f77c317d2f84d6d894d38d19 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Thu, 29 Jan 2026 11:32:04 +0100
Subject: [PATCH] ethosu: Add U85 fields, these are compatible with the U65

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39611>
---
 src/gallium/drivers/ethosu/registers.xml | 43 ++++++++++++++++++++----
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/ethosu/registers.xml b/src/gallium/drivers/ethosu/registers.xml
index 961accc44ed..fc156e48e5c 100644
--- a/src/gallium/drivers/ethosu/registers.xml
+++ b/src/gallium/drivers/ethosu/registers.xml
@@ -93,6 +93,15 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       <bitfield name="reserved0" low="2" high="15" type="uint"/>
       <bitfield name="mode" low="0" high="1" type="uint"/>
    </reg32>
+   <reg32 offset="0x108" name="NPU_SET_IFM_BROADCAST">
+      <bitfield name="reserved1" low="8" high="15" type="uint"/>
+      <bitfield name="broadcast_scalar" low="7" high="7" type="uint"/>
+      <bitfield name="operand_order" low="6" high="6" type="uint"/>
+      <bitfield name="reserved0" low="3" high="5" type="uint"/>
+      <bitfield name="broadcast_depth" low="2" high="2" type="uint"/>
+      <bitfield name="broadcast_width" low="1" high="1" type="uint"/>
+      <bitfield name="broadcast_height" low="0" high="0" type="uint"/>
+   </reg32>
    <reg32 offset="0x109" name="NPU_SET_IFM_ZERO_POINT">
       <bitfield name="param" low="0" high="15" type="uint"/>
    </reg32>
@@ -166,7 +175,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       <bitfield name="param" low="0" high="15" type="uint"/>
    </reg32>
    <reg32 offset="0x124" name="NPU_SET_ACC_FORMAT">
-      <bitfield name="param" low="0" high="15" type="uint"/>
+      <bitfield name="reserved3" low="11" high="15" type="uint"/>
+      <bitfield name="microblock" low="8" high="10" type="uint"/>
+      <bitfield name="reserved2" low="7" high="7" type="uint"/>
+      <bitfield name="acc_output" low="6" high="6" type="uint"/>
+      <bitfield name="acc_input" low="4" high="5" type="uint"/>
+      <bitfield name="reserved1" low="2" high="3" type="uint"/>
+      <bitfield name="acc_format" low="0" high="1" type="uint"/>
    </reg32>
    <reg32 offset="0x125" name="NPU_SET_ACTIVATION">
       <bitfield name="act_clip_range" low="12" high="15" type="uint"/>
@@ -187,6 +202,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    <reg32 offset="0x12d" name="NPU_SET_AB_START">
       <bitfield name="param" low="0" high="15" type="uint"/>
    </reg32>
+   <reg32 offset="0x12e" name="NPU_SET_WEIGHT_FORMAT">
+      <bitfield name="reserved1" low="5" high="15" type="uint"/>
+      <bitfield name="sparsity" low="4" high="4" type="uint"/>
+      <bitfield name="reserved0" low="1" high="3" type="uint"/>
+      <bitfield name="format" low="0" high="0" type="uint"/>
+   </reg32>
    <reg32 offset="0x12f" name="NPU_SET_BLOCKDEP">
       <bitfield name="param" low="0" high="15" type="uint"/>
    </reg32>
@@ -319,16 +340,24 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       <bitfield name="payload_size" low="0" high="1" type="uint"/>
    </reg32>
    <reg32 offset="0x24" name="NPU_SET_OFM_SCALE">
-      <bitfield name="shift" low="2" high="17" type="uint"/>
-      <bitfield name="payload_size" low="0" high="1" type="uint"/>
+      <bitfield name="round_mode" low="13" high="15" type="uint"/>
+      <bitfield name="reserved0" low="11" high="12" type="uint"/>
+      <bitfield name="dbl_rnd" low="6" high="10" type="uint"/>
+      <bitfield name="shift" low="0" high="5" type="uint"/>
    </reg32>
    <reg32 offset="0x25" name="NPU_SET_OPA_SCALE">
-      <bitfield name="shift" low="2" high="17" type="uint"/>
-      <bitfield name="payload_size" low="0" high="1" type="uint"/>
+      <bitfield name="reserved1" low="14" high="15" type="uint"/>
+      <bitfield name="round_mode" low="13" high="13" type="uint"/>
+      <bitfield name="reserved0" low="11" high="12" type="uint"/>
+      <bitfield name="dbl_rnd" low="6" high="10" type="uint"/>
+      <bitfield name="shift" low="0" high="5" type="uint"/>
    </reg32>
    <reg32 offset="0x26" name="NPU_SET_OPB_SCALE">
-      <bitfield name="reserved0" low="2" high="17" type="uint"/>
-      <bitfield name="payload_size" low="0" high="1" type="uint"/>
+      <bitfield name="reserved1" low="14" high="15" type="uint"/>
+      <bitfield name="round_mode" low="13" high="13" type="uint"/>
+      <bitfield name="reserved0" low="11" high="12" type="uint"/>
+      <bitfield name="dbl_rnd" low="6" high="10" type="uint"/>
+      <bitfield name="shift" low="0" high="5" type="uint"/>
    </reg32>
    <reg32 offset="0x30" name="NPU_SET_DMA0_SRC">
       <bitfield name="reserved0" low="2" high="17" type="uint"/>