etnaviv: Update includes from rnndb

Update to etna_viv commit 8486a97.

austriancoder: changed patch to include isa redefinition fix.

Signed-off-by: Wladimir J. van der Laan <[email protected]>
Reviewed-by: Christian Gmeiner <[email protected]>

5 files changed, 91 insertions, 20 deletions

diff --git a/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h b/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h
index 4e78eba6945..d4da03016ea 100644
--- a/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h
@@ -10,7 +10,7 @@ git clone git://0x04.net/rules-ng-ng
 The rules-ng-ng source files this header was generated from are:
 - cmdstream.xml (  14313 bytes, from 2016-11-17 18:46:23)
 - copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
-- common.xml    (  23473 bytes, from 2016-12-11 10:32:13)
+- common.xml    (  23473 bytes, from 2017-01-07 14:27:54)
 
 Copyright (C) 2012-2016 by the following authors:
 - Wladimir J. van der Laan <[email protected]>
diff --git a/src/gallium/drivers/etnaviv/hw/common.xml.h b/src/gallium/drivers/etnaviv/hw/common.xml.h
index 0f99db275de..8b73fd81289 100644
--- a/src/gallium/drivers/etnaviv/hw/common.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/common.xml.h
@@ -8,15 +8,15 @@ 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     (  19930 bytes, from 2016-12-14 15:25:40)
-- common.xml    (  23473 bytes, from 2016-12-11 10:32:13)
-- state_hi.xml  (  26403 bytes, from 2016-12-14 06:43:27)
+- state.xml     (  19930 bytes, from 2017-01-07 14:27:54)
+- common.xml    (  23473 bytes, from 2017-01-07 14:27:54)
+- state_hi.xml  (  26403 bytes, from 2017-01-07 14:27:54)
 - copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
 - state_2d.xml  (  51552 bytes, from 2016-10-29 07:29:22)
-- state_3d.xml  (  66957 bytes, from 2016-12-15 11:31:03)
+- state_3d.xml  (  66964 bytes, from 2017-04-13 12:38:05)
 - state_vg.xml  (   5975 bytes, from 2016-10-29 07:29:22)
 
-Copyright (C) 2012-2016 by the following authors:
+Copyright (C) 2012-2017 by the following authors:
 - Wladimir J. van der Laan <[email protected]>
 - Christian Gmeiner <[email protected]>
 - Lucas Stach <[email protected]>
diff --git a/src/gallium/drivers/etnaviv/hw/isa.xml.h b/src/gallium/drivers/etnaviv/hw/isa.xml.h
index c604b4407d4..31706807e3d 100644
--- a/src/gallium/drivers/etnaviv/hw/isa.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/isa.xml.h
@@ -8,10 +8,10 @@ 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:
-- isa.xml       (  30048 bytes, from 2016-12-12 13:26:33)
+- isa.xml       (  34392 bytes, from 2017-04-13 12:44:36)
 - copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
 
-Copyright (C) 2012-2016 by the following authors:
+Copyright (C) 2012-2017 by the following authors:
 - Wladimir J. van der Laan <[email protected]>
 - Christian Gmeiner <[email protected]>
 - Lucas Stach <[email protected]>
@@ -77,14 +77,54 @@ DEALINGS IN THE SOFTWARE.
 #define INST_OPCODE_FLOOR					0x00000025
 #define INST_OPCODE_CEIL					0x00000026
 #define INST_OPCODE_SIGN					0x00000027
+#define INST_OPCODE_ADDLO					0x00000028
+#define INST_OPCODE_MULLO					0x00000029
+#define INST_OPCODE_BARRIER					0x0000002a
+#define INST_OPCODE_SWIZZLE					0x0000002b
+#define INST_OPCODE_I2I						0x0000002c
 #define INST_OPCODE_I2F						0x0000002d
 #define INST_OPCODE_F2I						0x0000002e
+#define INST_OPCODE_F2IRND					0x0000002f
+#define INST_OPCODE_F2I7					0x00000030
 #define INST_OPCODE_CMP						0x00000031
 #define INST_OPCODE_LOAD					0x00000032
 #define INST_OPCODE_STORE					0x00000033
+#define INST_OPCODE_COPYSIGN					0x00000034
+#define INST_OPCODE_GETEXP					0x00000035
+#define INST_OPCODE_GETMANT					0x00000036
+#define INST_OPCODE_NAN						0x00000037
+#define INST_OPCODE_NEXTAFTER					0x00000038
+#define INST_OPCODE_ROUNDEVEN					0x00000039
+#define INST_OPCODE_ROUNDAWAY					0x0000003a
+#define INST_OPCODE_IADDSAT					0x0000003b
 #define INST_OPCODE_IMULLO0					0x0000003c
+#define INST_OPCODE_IMULLO1					0x0000003d
+#define INST_OPCODE_IMULLOSAT0					0x0000003e
+#define INST_OPCODE_IMULLOSAT1					0x0000003f
 #define INST_OPCODE_IMULHI0					0x00000040
+#define INST_OPCODE_IMULHI1					0x00000041
+#define INST_OPCODE_IMUL0					0x00000042
+#define INST_OPCODE_IMUL1					0x00000043
+#define INST_OPCODE_IDIV0					0x00000044
+#define INST_OPCODE_IDIV1					0x00000045
+#define INST_OPCODE_IDIV2					0x00000046
+#define INST_OPCODE_IDIV3					0x00000047
+#define INST_OPCODE_IMOD0					0x00000048
+#define INST_OPCODE_IMOD1					0x00000049
+#define INST_OPCODE_IMOD2					0x0000004a
+#define INST_OPCODE_IMOD3					0x0000004b
 #define INST_OPCODE_IMADLO0					0x0000004c
+#define INST_OPCODE_IMADLO1					0x0000004d
+#define INST_OPCODE_IMADLOSAT0					0x0000004e
+#define INST_OPCODE_IMADLOSAT1					0x0000004f
+#define INST_OPCODE_IMADHI0					0x00000050
+#define INST_OPCODE_IMADHI1					0x00000051
+#define INST_OPCODE_IMADHISAT0					0x00000052
+#define INST_OPCODE_IMADHISAT1					0x00000053
+#define INST_OPCODE_HALFADD					0x00000054
+#define INST_OPCODE_HALFADDINC					0x00000055
+#define INST_OPCODE_MOVAI					0x00000056
+#define INST_OPCODE_IABS					0x00000057
 #define INST_OPCODE_LEADZERO					0x00000058
 #define INST_OPCODE_LSHIFT					0x00000059
 #define INST_OPCODE_RSHIFT					0x0000005a
@@ -93,7 +133,38 @@ DEALINGS IN THE SOFTWARE.
 #define INST_OPCODE_AND						0x0000005d
 #define INST_OPCODE_XOR						0x0000005e
 #define INST_OPCODE_NOT						0x0000005f
+#define INST_OPCODE_BITSELECT					0x00000060
 #define INST_OPCODE_POPCOUNT					0x00000061
+#define INST_OPCODE_STOREB					0x00000062
+#define INST_OPCODE_RGB2YUV					0x00000063
+#define INST_OPCODE_DIV						0x00000064
+#define INST_OPCODE_ATOM_ADD					0x00000065
+#define INST_OPCODE_ATOM_XCHG					0x00000066
+#define INST_OPCODE_ATOM_CMP_XCHG				0x00000067
+#define INST_OPCODE_ATOM_MIN					0x00000068
+#define INST_OPCODE_ATOM_MAX					0x00000069
+#define INST_OPCODE_ATOM_OR					0x0000006a
+#define INST_OPCODE_ATOM_AND					0x0000006b
+#define INST_OPCODE_ATOM_XOR					0x0000006c
+#define INST_OPCODE_BIT_REV					0x0000006d
+#define INST_OPCODE_BYTE_REV					0x0000006e
+#define INST_OPCODE_TEXLDLPCF					0x0000006f
+#define INST_OPCODE_TEXLDGPCF					0x00000070
+#define INST_OPCODE_PACK					0x00000071
+#define INST_OPCODE_CONV					0x00000072
+#define INST_OPCODE_DP2						0x00000073
+#define INST_OPCODE_NORM_DP2					0x00000074
+#define INST_OPCODE_NORM_DP3					0x00000075
+#define INST_OPCODE_NORM_DP4					0x00000076
+#define INST_OPCODE_NORM_MUL					0x00000077
+#define INST_OPCODE_STORE_ATTR					0x00000078
+#define INST_OPCODE_LOAD_ATTR					0x00000079
+#define INST_OPCODE_EMIT					0x0000007a
+#define INST_OPCODE_RESTART					0x0000007b
+#define INST_OPCODE_NOP7C					0x0000007c
+#define INST_OPCODE_NOP7D					0x0000007d
+#define INST_OPCODE_NOP7E					0x0000007e
+#define INST_OPCODE_NOP7F					0x0000007f
 #define INST_CONDITION_TRUE					0x00000000
 #define INST_CONDITION_GT					0x00000001
 #define INST_CONDITION_LT					0x00000002
diff --git a/src/gallium/drivers/etnaviv/hw/state.xml.h b/src/gallium/drivers/etnaviv/hw/state.xml.h
index 73ef042d575..2b278e0fffb 100644
--- a/src/gallium/drivers/etnaviv/hw/state.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/state.xml.h
@@ -8,15 +8,15 @@ 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     (  19930 bytes, from 2016-12-14 15:25:40)
-- common.xml    (  23473 bytes, from 2016-12-11 10:32:13)
-- state_hi.xml  (  26403 bytes, from 2016-12-14 06:43:27)
+- state.xml     (  19930 bytes, from 2017-01-07 14:27:54)
+- common.xml    (  23473 bytes, from 2017-01-07 14:27:54)
+- state_hi.xml  (  26403 bytes, from 2017-01-07 14:27:54)
 - copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
 - state_2d.xml  (  51552 bytes, from 2016-10-29 07:29:22)
-- state_3d.xml  (  66957 bytes, from 2016-12-15 11:31:03)
+- state_3d.xml  (  66964 bytes, from 2017-04-13 12:38:05)
 - state_vg.xml  (   5975 bytes, from 2016-10-29 07:29:22)
 
-Copyright (C) 2012-2016 by the following authors:
+Copyright (C) 2012-2017 by the following authors:
 - Wladimir J. van der Laan <[email protected]>
 - Christian Gmeiner <[email protected]>
 - Lucas Stach <[email protected]>
diff --git a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
index a56c4a81777..332188eba76 100644
--- a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
@@ -8,15 +8,15 @@ 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     (  19930 bytes, from 2016-12-14 15:25:40)
-- common.xml    (  23473 bytes, from 2016-12-11 10:32:13)
-- state_hi.xml  (  26403 bytes, from 2016-12-14 06:43:27)
+- state.xml     (  19930 bytes, from 2017-01-07 14:27:54)
+- common.xml    (  23473 bytes, from 2017-01-07 14:27:54)
+- state_hi.xml  (  26403 bytes, from 2017-01-07 14:27:54)
 - copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
 - state_2d.xml  (  51552 bytes, from 2016-10-29 07:29:22)
-- state_3d.xml  (  66957 bytes, from 2016-12-15 11:31:03)
+- state_3d.xml  (  66964 bytes, from 2017-04-13 12:38:05)
 - state_vg.xml  (   5975 bytes, from 2016-10-29 07:29:22)
 
-Copyright (C) 2012-2016 by the following authors:
+Copyright (C) 2012-2017 by the following authors:
 - Wladimir J. van der Laan <[email protected]>
 - Christian Gmeiner <[email protected]>
 - Lucas Stach <[email protected]>
@@ -989,8 +989,8 @@ DEALINGS IN THE SOFTWARE.
 
 #define VIVS_RS_UNK016B4					0x000016b4
 
-#define VIVS_RS_UNK016B8					0x000016b8
-#define VIVS_RS_UNK016B8_UNK0					0x00000001
+#define VIVS_RS_SINGLE_BUFFER					0x000016b8
+#define VIVS_RS_SINGLE_BUFFER_ENABLE				0x00000001
 
 #define VIVS_RS_UNK016BC					0x000016bc