Mesa (main): etnaviv: update headers from rnndb

[GitLab Mirror]

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

Author: Lucas Stach <l.stach at pengutronix.de>
Date:   Sat Apr  9 23:14:16 2022 +0200

etnaviv: update headers from rnndb

Update to rnndb commit ad665b720421.

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/hw/state_3d.xml.h | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
index 443649c62e7..35922bb1f26 100644
--- a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
@@ -8,17 +8,17 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
 git clone git://0x04.net/rules-ng-ng
 
 The rules-ng-ng source files this header was generated from are:
-- state.xml     (  26877 bytes, from 2020-10-28 12:56:03)
+- state.xml     (  26877 bytes, from 2022-04-09 20:48:40)
 - common.xml    (  35468 bytes, from 2020-10-28 12:56:03)
 - common_3d.xml (  15058 bytes, from 2020-10-28 12:56:03)
 - state_hi.xml  (  34803 bytes, from 2020-10-28 12:56:03)
 - copyright.xml (   1597 bytes, from 2020-10-28 12:56:03)
 - state_2d.xml  (  51552 bytes, from 2020-10-28 12:56:03)
-- state_3d.xml  (  84002 bytes, from 2020-11-01 11:28:08)
+- state_3d.xml  (  84326 bytes, from 2022-04-09 21:11:44)
 - state_blt.xml (  14252 bytes, from 2020-10-28 12:56:03)
 - state_vg.xml  (   5975 bytes, from 2020-10-28 12:56:03)
 
-Copyright (C) 2012-2020 by the following authors:
+Copyright (C) 2012-2022 by the following authors:
 - Wladimir J. van der Laan <laanwj at gmail.com>
 - Christian Gmeiner <christian.gmeiner at gmail.com>
 - Lucas Stach <l.stach at pengutronix.de>
@@ -982,8 +982,8 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_PE_COLOR_FORMAT_COMPONENTS__MASK			0x00000f00
 #define VIVS_PE_COLOR_FORMAT_COMPONENTS__SHIFT			8
 #define VIVS_PE_COLOR_FORMAT_COMPONENTS(x)			(((x) << VIVS_PE_COLOR_FORMAT_COMPONENTS__SHIFT) & VIVS_PE_COLOR_FORMAT_COMPONENTS__MASK)
-#define VIVS_PE_COLOR_FORMAT_SUPER_TILED_NEW			0x00002000
 #define VIVS_PE_COLOR_FORMAT_COMPONENTS_MASK			0x00001000
+#define VIVS_PE_COLOR_FORMAT_SUPER_TILED_NEW			0x00002000
 #define VIVS_PE_COLOR_FORMAT_OVERWRITE				0x00010000
 #define VIVS_PE_COLOR_FORMAT_OVERWRITE_MASK			0x00020000
 #define VIVS_PE_COLOR_FORMAT_SUPER_TILED			0x00100000
@@ -1237,7 +1237,10 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_RS_SOURCE_STRIDE_STRIDE__MASK			0x0003ffff
 #define VIVS_RS_SOURCE_STRIDE_STRIDE__SHIFT			0
 #define VIVS_RS_SOURCE_STRIDE_STRIDE(x)				(((x) << VIVS_RS_SOURCE_STRIDE_STRIDE__SHIFT) & VIVS_RS_SOURCE_STRIDE_STRIDE__MASK)
-#define VIVS_RS_SOURCE_STRIDE_UNK29				0x20000000
+#define VIVS_RS_SOURCE_STRIDE_TS_MODE__MASK			0x20000000
+#define VIVS_RS_SOURCE_STRIDE_TS_MODE__SHIFT			29
+#define VIVS_RS_SOURCE_STRIDE_TS_MODE(x)			(((x) << VIVS_RS_SOURCE_STRIDE_TS_MODE__SHIFT) & VIVS_RS_SOURCE_STRIDE_TS_MODE__MASK)
+#define VIVS_RS_SOURCE_STRIDE_SUPER_TILED_NEW			0x08000000
 #define VIVS_RS_SOURCE_STRIDE_MULTI				0x40000000
 #define VIVS_RS_SOURCE_STRIDE_TILING				0x80000000
 
@@ -1247,6 +1250,7 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_RS_DEST_STRIDE_STRIDE__MASK			0x0003ffff
 #define VIVS_RS_DEST_STRIDE_STRIDE__SHIFT			0
 #define VIVS_RS_DEST_STRIDE_STRIDE(x)				(((x) << VIVS_RS_DEST_STRIDE_STRIDE__SHIFT) & VIVS_RS_DEST_STRIDE_STRIDE__MASK)
+#define VIVS_RS_DEST_STRIDE_SUPER_TILED_NEW			0x08000000
 #define VIVS_RS_DEST_STRIDE_MULTI				0x40000000
 #define VIVS_RS_DEST_STRIDE_TILING				0x80000000
 
@@ -1789,7 +1793,8 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX__MASK		0x0000001c
 #define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX__SHIFT		2
 #define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX(x)			(((x) << VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX__SHIFT) & VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX__MASK)
-#define VIVS_NTE_DESCRIPTOR_TX_CTRL_COMPRESSION			0x00000040
+#define VIVS_NTE_DESCRIPTOR_TX_CTRL_COMPRESSION			0x00000020
+#define VIVS_NTE_DESCRIPTOR_TX_CTRL_128B_TILE			0x00000040
 
 #define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_MIRROR(i0)	       (0x00016000 + 0x4*(i0))