drm/etnaviv: update hardware headers from rnndb
authorLucas Stach <l.stach@pengutronix.de>
Mon, 22 Jan 2018 11:11:16 +0000 (12:11 +0100)
committerLucas Stach <l.stach@pengutronix.de>
Fri, 9 Mar 2018 11:22:36 +0000 (12:22 +0100)
Update the state HI and common header from rnndb commit
8478eef32fd9 (rnndb: document secure GPU reset bit).

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
drivers/gpu/drm/etnaviv/common.xml.h
drivers/gpu/drm/etnaviv/state.xml.h
drivers/gpu/drm/etnaviv/state_3d.xml.h
drivers/gpu/drm/etnaviv/state_blt.xml.h [new file with mode: 0644]
drivers/gpu/drm/etnaviv/state_hi.xml.h

index 207f45c999c34e2840e9fe138d44169402cb9881..001faea80fef2c1c3b9ff4e98e365c646010669c 100644 (file)
@@ -8,15 +8,12 @@ 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 2017-03-09 15:43:43)
-- common.xml    (  23473 bytes, from 2017-03-09 15:43:43)
-- state_hi.xml  (  26403 bytes, from 2017-03-09 15:43:43)
-- copyright.xml (   1597 bytes, from 2016-12-08 16:37:56)
-- state_2d.xml  (  51552 bytes, from 2016-12-08 16:37:56)
-- state_3d.xml  (  66957 bytes, from 2017-03-09 15:43:43)
-- state_vg.xml  (   5975 bytes, from 2016-12-08 16:37:56)
+- texdesc_3d.xml (   3183 bytes, from 2017-12-18 16:51:59)
+- copyright.xml  (   1597 bytes, from 2016-12-08 16:37:56)
+- common.xml     (  35468 bytes, from 2018-01-22 13:48:54)
+- common_3d.xml  (  14615 bytes, from 2017-12-18 16:51:59)
 
-Copyright (C) 2012-2017 by the following authors:
+Copyright (C) 2012-2018 by the following authors:
 - Wladimir J. van der Laan <laanwj@gmail.com>
 - Christian Gmeiner <christian.gmeiner@gmail.com>
 - Lucas Stach <l.stach@pengutronix.de>
@@ -49,12 +46,7 @@ DEALINGS IN THE SOFTWARE.
 #define SYNC_RECIPIENT_RA                                      0x00000005
 #define SYNC_RECIPIENT_PE                                      0x00000007
 #define SYNC_RECIPIENT_DE                                      0x0000000b
-#define SYNC_RECIPIENT_VG                                      0x0000000f
-#define SYNC_RECIPIENT_TESSELATOR                              0x00000010
-#define SYNC_RECIPIENT_VG2                                     0x00000011
-#define SYNC_RECIPIENT_TESSELATOR2                             0x00000012
-#define SYNC_RECIPIENT_VG3                                     0x00000013
-#define SYNC_RECIPIENT_TESSELATOR3                             0x00000014
+#define SYNC_RECIPIENT_BLT                                     0x00000010
 #define ENDIAN_MODE_NO_SWAP                                    0x00000000
 #define ENDIAN_MODE_SWAP_16                                    0x00000001
 #define ENDIAN_MODE_SWAP_32                                    0x00000002
@@ -77,6 +69,7 @@ DEALINGS IN THE SOFTWARE.
 #define chipModel_GC800                                                0x00000800
 #define chipModel_GC860                                                0x00000860
 #define chipModel_GC880                                                0x00000880
+#define chipModel_GC900                                                0x00000900
 #define chipModel_GC1000                                       0x00001000
 #define chipModel_GC1500                                       0x00001500
 #define chipModel_GC2000                                       0x00002000
@@ -88,6 +81,12 @@ DEALINGS IN THE SOFTWARE.
 #define chipModel_GC5000                                       0x00005000
 #define chipModel_GC5200                                       0x00005200
 #define chipModel_GC6400                                       0x00006400
+#define chipModel_GC7000                                       0x00007000
+#define chipModel_GC7400                                       0x00007400
+#define chipModel_GC8000                                       0x00008000
+#define chipModel_GC8100                                       0x00008100
+#define chipModel_GC8200                                       0x00008200
+#define chipModel_GC8400                                       0x00008400
 #define RGBA_BITS_R                                            0x00000001
 #define RGBA_BITS_G                                            0x00000002
 #define RGBA_BITS_B                                            0x00000004
@@ -203,7 +202,7 @@ DEALINGS IN THE SOFTWARE.
 #define chipMinorFeatures2_RGB888                              0x00001000
 #define chipMinorFeatures2_TX__YUV_ASSEMBLER                   0x00002000
 #define chipMinorFeatures2_DYNAMIC_FREQUENCY_SCALING           0x00004000
-#define chipMinorFeatures2_EXTRA_TEXTURE_STATE                 0x00008000
+#define chipMinorFeatures2_TX_FILTER                           0x00008000
 #define chipMinorFeatures2_FULL_DIRECTFB                       0x00010000
 #define chipMinorFeatures2_2D_TILING                           0x00020000
 #define chipMinorFeatures2_THREAD_WALKER_IN_PS                 0x00040000
@@ -242,36 +241,36 @@ DEALINGS IN THE SOFTWARE.
 #define chipMinorFeatures3_TX_ENHANCEMENTS1                    0x00080000
 #define chipMinorFeatures3_SH_ENHANCEMENTS1                    0x00100000
 #define chipMinorFeatures3_SH_ENHANCEMENTS2                    0x00200000
-#define chipMinorFeatures3_UNK22                               0x00400000
+#define chipMinorFeatures3_PE_ENHANCEMENTS1                    0x00400000
 #define chipMinorFeatures3_2D_FC_SOURCE                                0x00800000
-#define chipMinorFeatures3_UNK24                               0x01000000
-#define chipMinorFeatures3_UNK25                               0x02000000
+#define chipMinorFeatures3_BUG_FIXES_14                                0x01000000
+#define chipMinorFeatures3_POWER_OPTIMIZATIONS_0               0x02000000
 #define chipMinorFeatures3_NEW_HZ                              0x04000000
-#define chipMinorFeatures3_UNK27                               0x08000000
-#define chipMinorFeatures3_UNK28                               0x10000000
+#define chipMinorFeatures3_PE_DITHER_FIX                       0x08000000
+#define chipMinorFeatures3_DE_ENHANCEMENTS3                    0x10000000
 #define chipMinorFeatures3_SH_ENHANCEMENTS3                    0x20000000
-#define chipMinorFeatures3_UNK30                               0x40000000
-#define chipMinorFeatures3_UNK31                               0x80000000
-#define chipMinorFeatures4_UNK0                                        0x00000001
+#define chipMinorFeatures3_SH_ENHANCEMENTS4                    0x40000000
+#define chipMinorFeatures3_TX_ENHANCEMENTS2                    0x80000000
+#define chipMinorFeatures4_FE_ENHANCEMENTS1                    0x00000001
 #define chipMinorFeatures4_PE_ENHANCEMENTS2                    0x00000002
 #define chipMinorFeatures4_FRUSTUM_CLIP_FIX                    0x00000004
-#define chipMinorFeatures4_UNK3                                        0x00000008
-#define chipMinorFeatures4_UNK4                                        0x00000010
+#define chipMinorFeatures4_DE_NO_GAMMA                         0x00000008
+#define chipMinorFeatures4_PA_ENHANCEMENTS_2                   0x00000010
 #define chipMinorFeatures4_2D_GAMMA                            0x00000020
 #define chipMinorFeatures4_SINGLE_BUFFER                       0x00000040
-#define chipMinorFeatures4_UNK7                                        0x00000080
-#define chipMinorFeatures4_UNK8                                        0x00000100
-#define chipMinorFeatures4_UNK9                                        0x00000200
-#define chipMinorFeatures4_UNK10                               0x00000400
+#define chipMinorFeatures4_HI_ENHANCEMENTS_1                   0x00000080
+#define chipMinorFeatures4_TX_ENHANCEMENTS_3                   0x00000100
+#define chipMinorFeatures4_SH_ENHANCEMENTS_5                   0x00000200
+#define chipMinorFeatures4_FE_ENHANCEMENTS_2                   0x00000400
 #define chipMinorFeatures4_TX_LERP_PRECISION_FIX               0x00000800
 #define chipMinorFeatures4_2D_COLOR_SPACE_CONVERSION           0x00001000
 #define chipMinorFeatures4_TEXTURE_ASTC                                0x00002000
-#define chipMinorFeatures4_UNK14                               0x00004000
-#define chipMinorFeatures4_UNK15                               0x00008000
+#define chipMinorFeatures4_PE_ENHANCEMENTS_4                   0x00004000
+#define chipMinorFeatures4_MC_ENHANCEMENTS_1                   0x00008000
 #define chipMinorFeatures4_HALTI2                              0x00010000
-#define chipMinorFeatures4_UNK17                               0x00020000
+#define chipMinorFeatures4_2D_MIRROR_EXTENSION                 0x00020000
 #define chipMinorFeatures4_SMALL_MSAA                          0x00040000
-#define chipMinorFeatures4_UNK19                               0x00080000
+#define chipMinorFeatures4_BUG_FIXES_17                                0x00080000
 #define chipMinorFeatures4_NEW_RA                              0x00100000
 #define chipMinorFeatures4_2D_OPF_YUV_OUTPUT                   0x00200000
 #define chipMinorFeatures4_2D_MULTI_SOURCE_BLT_EX2             0x00400000
@@ -280,41 +279,207 @@ DEALINGS IN THE SOFTWARE.
 #define chipMinorFeatures4_BUG_FIXES18                         0x02000000
 #define chipMinorFeatures4_2D_COMPRESSION                      0x04000000
 #define chipMinorFeatures4_PROBE                               0x08000000
-#define chipMinorFeatures4_UNK28                               0x10000000
+#define chipMinorFeatures4_MEDIUM_PRECISION                    0x10000000
 #define chipMinorFeatures4_2D_SUPER_TILE_VERSION               0x20000000
-#define chipMinorFeatures4_UNK30                               0x40000000
-#define chipMinorFeatures4_UNK31                               0x80000000
-#define chipMinorFeatures5_UNK0                                        0x00000001
-#define chipMinorFeatures5_UNK1                                        0x00000002
-#define chipMinorFeatures5_UNK2                                        0x00000004
-#define chipMinorFeatures5_UNK3                                        0x00000008
+#define chipMinorFeatures4_BUG_FIXES19                         0x40000000
+#define chipMinorFeatures4_SH_ENHANCEMENTS6                    0x80000000
+#define chipMinorFeatures5_SH_ENHANCEMENTS7                    0x00000001
+#define chipMinorFeatures5_BUG_FIXES20                         0x00000002
+#define chipMinorFeatures5_DE_ADDRESS_40                       0x00000004
+#define chipMinorFeatures5_MINI_MMU_FIX                                0x00000008
 #define chipMinorFeatures5_EEZ                                 0x00000010
-#define chipMinorFeatures5_UNK5                                        0x00000020
-#define chipMinorFeatures5_UNK6                                        0x00000040
-#define chipMinorFeatures5_UNK7                                        0x00000080
-#define chipMinorFeatures5_UNK8                                        0x00000100
+#define chipMinorFeatures5_BUG_FIXES21                         0x00000020
+#define chipMinorFeatures5_EXTRA_VG_CAPS                       0x00000040
+#define chipMinorFeatures5_MULTI_SRC_V15                       0x00000080
+#define chipMinorFeatures5_BUG_FIXES22                         0x00000100
 #define chipMinorFeatures5_HALTI3                              0x00000200
-#define chipMinorFeatures5_UNK10                               0x00000400
+#define chipMinorFeatures5_TESSELATION_SHADERS                 0x00000400
 #define chipMinorFeatures5_2D_ONE_PASS_FILTER_TAP              0x00000800
-#define chipMinorFeatures5_UNK12                               0x00001000
+#define chipMinorFeatures5_MULTI_SRC_V2_STR_QUAD               0x00001000
 #define chipMinorFeatures5_SEPARATE_SRC_DST                    0x00002000
 #define chipMinorFeatures5_HALTI4                              0x00004000
-#define chipMinorFeatures5_UNK15                               0x00008000
+#define chipMinorFeatures5_RA_WRITE_DEPTH                      0x00008000
 #define chipMinorFeatures5_ANDROID_ONLY                                0x00010000
 #define chipMinorFeatures5_HAS_PRODUCTID                       0x00020000
-#define chipMinorFeatures5_UNK18                               0x00040000
-#define chipMinorFeatures5_UNK19                               0x00080000
+#define chipMinorFeatures5_TX_SUPPORT_DEC                      0x00040000
+#define chipMinorFeatures5_S8_MSAA_COMPRESSION                 0x00080000
 #define chipMinorFeatures5_PE_DITHER_FIX2                      0x00100000
-#define chipMinorFeatures5_UNK21                               0x00200000
-#define chipMinorFeatures5_UNK22                               0x00400000
-#define chipMinorFeatures5_UNK23                               0x00800000
-#define chipMinorFeatures5_UNK24                               0x01000000
-#define chipMinorFeatures5_UNK25                               0x02000000
-#define chipMinorFeatures5_UNK26                               0x04000000
+#define chipMinorFeatures5_L2_CACHE_REMOVE                     0x00200000
+#define chipMinorFeatures5_FE_ALLOW_RND_VTX_CNT                        0x00400000
+#define chipMinorFeatures5_CUBE_MAP_FL28                       0x00800000
+#define chipMinorFeatures5_TX_6BIT_FRAC                                0x01000000
+#define chipMinorFeatures5_FE_ALLOW_STALL_PREFETCH_ENG         0x02000000
+#define chipMinorFeatures5_THIRD_PARTY_COMPRESSION             0x04000000
 #define chipMinorFeatures5_RS_DEPTHSTENCIL_NATIVE_SUPPORT      0x08000000
 #define chipMinorFeatures5_V2_MSAA_COMP_FIX                    0x10000000
-#define chipMinorFeatures5_UNK29                               0x20000000
-#define chipMinorFeatures5_UNK30                               0x40000000
-#define chipMinorFeatures5_UNK31                               0x80000000
+#define chipMinorFeatures5_HALTI5                              0x20000000
+#define chipMinorFeatures5_EVIS                                        0x40000000
+#define chipMinorFeatures5_BLT_ENGINE                          0x80000000
+#define chipMinorFeatures6_BUG_FIXES_23                                0x00000001
+#define chipMinorFeatures6_BUG_FIXES_24                                0x00000002
+#define chipMinorFeatures6_DEC                                 0x00000004
+#define chipMinorFeatures6_VS_TILE_NV12                                0x00000008
+#define chipMinorFeatures6_VS_TILE_NV12_10BIT                  0x00000010
+#define chipMinorFeatures6_RENDER_TARGET_8                     0x00000020
+#define chipMinorFeatures6_TEX_LOD_FLOW_CORR                   0x00000040
+#define chipMinorFeatures6_FACE_LOD                            0x00000080
+#define chipMinorFeatures6_MULTI_CORE_SEMAPHORE_STALL_V2       0x00000100
+#define chipMinorFeatures6_VMSAA                               0x00000200
+#define chipMinorFeatures6_CHIP_ENABLE_LINK                    0x00000400
+#define chipMinorFeatures6_MULTI_SRC_BLT_1_5_ENHANCEMENT       0x00000800
+#define chipMinorFeatures6_MULTI_SRC_BLT_BILINEAR_FILTER       0x00001000
+#define chipMinorFeatures6_RA_HZEZ_CLOCK_CONTROL               0x00002000
+#define chipMinorFeatures6_CACHE128B256BPERLINE                        0x00004000
+#define chipMinorFeatures6_V4_COMPRESSION                      0x00008000
+#define chipMinorFeatures6_PE2D_MAJOR_SUPER_TILE               0x00010000
+#define chipMinorFeatures6_PE_32BPC_COLORMASK_FIX              0x00020000
+#define chipMinorFeatures6_ALPHA_BLENDING_OPT                  0x00040000
+#define chipMinorFeatures6_NEW_GPIPE                           0x00080000
+#define chipMinorFeatures6_PIPELINE_32_ATTRIBUTES              0x00100000
+#define chipMinorFeatures6_MSAA_SHADING                                0x00200000
+#define chipMinorFeatures6_NO_ANISTRO_FILTER                   0x00400000
+#define chipMinorFeatures6_NO_ASTC                             0x00800000
+#define chipMinorFeatures6_NO_DXT                              0x01000000
+#define chipMinorFeatures6_HWTFB                               0x02000000
+#define chipMinorFeatures6_RA_DEPTH_WRITE_MSAA1X_FIX           0x04000000
+#define chipMinorFeatures6_EZHZ_CLOCKGATE_FIX                  0x08000000
+#define chipMinorFeatures6_SH_SNAP2PAGE_FIX                    0x10000000
+#define chipMinorFeatures6_SH_HALFDEPENDENCY_FIX               0x20000000
+#define chipMinorFeatures6_USC_MCFILL_FIX                      0x40000000
+#define chipMinorFeatures6_TPG_TCPERF_FIX                      0x80000000
+#define chipMinorFeatures7_USC_MDFIFO_OVERFLOW_FIX             0x00000001
+#define chipMinorFeatures7_SH_TEXLD_BARRIER_IN_CS_FIX          0x00000002
+#define chipMinorFeatures7_RS_NEW_BASEADDR                     0x00000004
+#define chipMinorFeatures7_PE_8BPP_DUALPIPE_FIX                        0x00000008
+#define chipMinorFeatures7_SH_ADVANCED_INSTR                   0x00000010
+#define chipMinorFeatures7_SH_FLAT_INTERPOLATION_DUAL16_FIX    0x00000020
+#define chipMinorFeatures7_USC_CONTINUOUS_FLUS_FIX             0x00000040
+#define chipMinorFeatures7_SH_SUPPORT_V4                       0x00000080
+#define chipMinorFeatures7_SH_SUPPORT_ALPHA_KILL               0x00000100
+#define chipMinorFeatures7_PE_NO_ALPHA_TEST                    0x00000200
+#define chipMinorFeatures7_TX_LOD_NEAREST_SELECT               0x00000400
+#define chipMinorFeatures7_SH_FIX_LDEXP                                0x00000800
+#define chipMinorFeatures7_SUPPORT_MOVAI                       0x00001000
+#define chipMinorFeatures7_SH_SNAP2PAGE_MAXPAGES_FIX           0x00002000
+#define chipMinorFeatures7_PE_RGBA16I_FIX                      0x00004000
+#define chipMinorFeatures7_BLT_8bpp_256TILE_FC_FIX             0x00008000
+#define chipMinorFeatures7_PE_64BIT_FENCE_FIX                  0x00010000
+#define chipMinorFeatures7_USC_FULL_CACHE_FIX                  0x00020000
+#define chipMinorFeatures7_TX_YUV_ASSEMBLER_10BIT              0x00040000
+#define chipMinorFeatures7_FE_32BIT_INDEX_FIX                  0x00080000
+#define chipMinorFeatures7_BLT_64BPP_MASKED_CLEAR_FIX          0x00100000
+#define chipMinorFeatures7_BIT_SECURITY                                0x00200000
+#define chipMinorFeatures7_BIT_ROBUSTNESS                      0x00400000
+#define chipMinorFeatures7_USC_ATOMIC_FIX                      0x00800000
+#define chipMinorFeatures7_SH_PSO_MSAA1x_FIX                   0x01000000
+#define chipMinorFeatures7_BIT_USC_VX_PERF_FIX                 0x02000000
+#define chipMinorFeatures7_EVIS_NO_ABSDIFF                     0x04000000
+#define chipMinorFeatures7_EVIS_NO_BITREPLACE                  0x08000000
+#define chipMinorFeatures7_EVIS_NO_BOXFILTER                   0x10000000
+#define chipMinorFeatures7_EVIS_NO_CORDIAC                     0x20000000
+#define chipMinorFeatures7_EVIS_NO_DP32                                0x40000000
+#define chipMinorFeatures7_EVIS_NO_FILTER                      0x80000000
+#define chipMinorFeatures8_EVIS_NO_IADD                                0x00000001
+#define chipMinorFeatures8_EVIS_NO_SELECTADD                   0x00000002
+#define chipMinorFeatures8_EVIS_LERP_7OUTPUT                   0x00000004
+#define chipMinorFeatures8_EVIS_ACCSQ_8OUTPUT                  0x00000008
+#define chipMinorFeatures8_USC_GOS_ADDR_FIX                    0x00000010
+#define chipMinorFeatures8_TX_8BIT_UVFRAC                      0x00000020
+#define chipMinorFeatures8_TX_DESC_CACHE_CLOCKGATE_FIX         0x00000040
+#define chipMinorFeatures8_RSBLT_MSAA_DECOMPRESSION            0x00000080
+#define chipMinorFeatures8_TX_INTEGER_COORDINATE               0x00000100
+#define chipMinorFeatures8_DRAWID                              0x00000200
+#define chipMinorFeatures8_PSIO_SAMPLEMASK_IN_R0ZW_FIX         0x00000400
+#define chipMinorFeatures8_TX_INTEGER_COORDINATE_V2            0x00000800
+#define chipMinorFeatures8_MULTI_CORE_BLOCK_SET_CONFIG         0x00001000
+#define chipMinorFeatures8_VG_RESOLVE_ENGINE                   0x00002000
+#define chipMinorFeatures8_VG_PE_COLOR_KEY                     0x00004000
+#define chipMinorFeatures8_VG_IM_INDEX_FORMAT                  0x00008000
+#define chipMinorFeatures8_SNAPPAGE_CMD                                0x00010000
+#define chipMinorFeatures8_SH_NO_INDEX_CONST_ON_A0             0x00020000
+#define chipMinorFeatures8_SH_NO_ONECONST_LIMIT                        0x00040000
+#define chipMinorFeatures8_SH_IMG_LDST_ON_TEMP                 0x00080000
+#define chipMinorFeatures8_COMPUTE_ONLY                                0x00100000
+#define chipMinorFeatures8_SH_IMG_LDST_CLAMP                   0x00200000
+#define chipMinorFeatures8_SH_ICACHE_ALLOC_COUNT_FIX           0x00400000
+#define chipMinorFeatures8_SH_ICACHE_PREFETCH                  0x00800000
+#define chipMinorFeatures8_PE2D_SEPARATE_CACHE                 0x01000000
+#define chipMinorFeatures8_VG_AYUV_INPUT_OUTPUT                        0x02000000
+#define chipMinorFeatures8_VG_DOUBLE_IMAGE                     0x04000000
+#define chipMinorFeatures8_VG_RECTANGLE_STRIPE_MODE            0x08000000
+#define chipMinorFeatures8_VG_MMU                              0x10000000
+#define chipMinorFeatures8_VG_IM_FILTER                                0x20000000
+#define chipMinorFeatures8_VG_IM_YUV_PACKET                    0x40000000
+#define chipMinorFeatures8_VG_IM_YUV_PLANAR                    0x80000000
+#define chipMinorFeatures9_VG_PE_YUV_PACKET                    0x00000001
+#define chipMinorFeatures9_VG_COLOR_PRECISION_8_BIT            0x00000002
+#define chipMinorFeatures9_PE_MSAA_OQ_FIX                      0x00000004
+#define chipMinorFeatures9_PSIO_MSAA_CL_FIX                    0x00000008
+#define chipMinorFeatures9_USC_DEFER_FILL_FIX                  0x00000010
+#define chipMinorFeatures9_SH_CLOCK_GATE_FIX                   0x00000020
+#define chipMinorFeatures9_FE_NEED_DUMMYDRAW                   0x00000040
+#define chipMinorFeatures9_PE2D_LINEAR_YUV420_OUTPUT           0x00000080
+#define chipMinorFeatures9_PE2D_LINEAR_YUV420_10BIT            0x00000100
+#define chipMinorFeatures9_MULTI_CLUSTER                       0x00000200
+#define chipMinorFeatures9_VG_TS_CULLING                       0x00000400
+#define chipMinorFeatures9_VG_FP25                             0x00000800
+#define chipMinorFeatures9_SH_MULTI_WG_PACK                    0x00001000
+#define chipMinorFeatures9_SH_DUAL16_SAMPLEMASK_ZW             0x00002000
+#define chipMinorFeatures9_TPG_TRIVIAL_MODE_FIX                        0x00004000
+#define chipMinorFeatures9_TX_ASTC_MULTISLICE_FIX              0x00008000
+#define chipMinorFeatures9_FE_ROBUST_FIX                       0x00010000
+#define chipMinorFeatures9_SH_GPIPE_ACCESS_FULLTEMPS           0x00020000
+#define chipMinorFeatures9_PSIO_INTERLOCK                      0x00040000
+#define chipMinorFeatures9_PA_WIDELINE_FIX                     0x00080000
+#define chipMinorFeatures9_WIDELINE_HELPER_FIX                 0x00100000
+#define chipMinorFeatures9_G2D_3RD_PARTY_COMPRESSION_1_1       0x00200000
+#define chipMinorFeatures9_TX_FLUSH_L1CACHE                    0x00400000
+#define chipMinorFeatures9_PE_DITHER_FIX2                      0x00800000
+#define chipMinorFeatures9_G2D_DEC400                          0x01000000
+#define chipMinorFeatures9_SH_TEXLD_U_FIX                      0x02000000
+#define chipMinorFeatures9_MC_FCCACHE_BYTEMASK                 0x04000000
+#define chipMinorFeatures9_SH_MULTI_WG_PACK_FIX                        0x08000000
+#define chipMinorFeatures9_DC_OVERLAY_SCALING                  0x10000000
+#define chipMinorFeatures9_DC_SOURCE_ROTATION                  0x20000000
+#define chipMinorFeatures9_DC_TILED                            0x40000000
+#define chipMinorFeatures9_DC_YUV_L1                           0x80000000
+#define chipMinorFeatures10_DC_D30_OUTPUT                      0x00000001
+#define chipMinorFeatures10_DC_MMU                             0x00000002
+#define chipMinorFeatures10_DC_COMPRESSION                     0x00000004
+#define chipMinorFeatures10_DC_QOS                             0x00000008
+#define chipMinorFeatures10_PE_ADVANCE_BLEND_PART0             0x00000010
+#define chipMinorFeatures10_FE_PATCHLIST_FETCH_FIX             0x00000020
+#define chipMinorFeatures10_RA_CG_FIX                          0x00000040
+#define chipMinorFeatures10_EVIS_VX2                           0x00000080
+#define chipMinorFeatures10_NN_FLOAT                           0x00000100
+#define chipMinorFeatures10_DEC400                             0x00000200
+#define chipMinorFeatures10_LS_SUPPORT_PERCOMP_DEPENDENCY      0x00000400
+#define chipMinorFeatures10_TP_ENGINE                          0x00000800
+#define chipMinorFeatures10_MULTI_CORE_BLOCK_SET_CONFIG2       0x00001000
+#define chipMinorFeatures10_PE_VMSAA_COVERAGE_CACHE_FIX                0x00002000
+#define chipMinorFeatures10_SECURITY_AHB                       0x00004000
+#define chipMinorFeatures10_MULTICORE_SEMAPHORESTALL_V3                0x00008000
+#define chipMinorFeatures10_SMALLBATCH                         0x00010000
+#define chipMinorFeatures10_SH_CMPLX                           0x00020000
+#define chipMinorFeatures10_SH_IDIV0_SWZL_EHS                  0x00040000
+#define chipMinorFeatures10_TX_LERP_LESS_BIT                   0x00080000
+#define chipMinorFeatures10_SH_GM_ENDIAN                       0x00100000
+#define chipMinorFeatures10_SH_GM_USC_UNALLOC                  0x00200000
+#define chipMinorFeatures10_SH_END_OF_BB                       0x00400000
+#define chipMinorFeatures10_VIP_V7                             0x00800000
+#define chipMinorFeatures10_TX_BORDER_CLAMP_FIX                        0x01000000
+#define chipMinorFeatures10_SH_IMG_LD_LASTPIXEL_FIX            0x02000000
+#define chipMinorFeatures10_ASYNC_BLT                          0x04000000
+#define chipMinorFeatures10_ASYNC_FE_FENCE_FIX                 0x08000000
+#define chipMinorFeatures10_PSCS_THROTTLE                      0x10000000
+#define chipMinorFeatures10_SEPARATE_LS                                0x20000000
+#define chipMinorFeatures10_MCFE                               0x40000000
+#define chipMinorFeatures10_WIDELINE_TRIANGLE_EMU              0x80000000
+#define chipMinorFeatures11_VG_RESOLUTION_8K                   0x00000001
+#define chipMinorFeatures11_FENCE_32BIT                                0x00000002
+#define chipMinorFeatures11_FENCE_64BIT                                0x00000004
+#define chipMinorFeatures11_NN_INTERLEVE8                      0x00000008
+#define chipMinorFeatures11_TP_REORDER                         0x00000010
+#define chipMinorFeatures11_PE_DEPTH_ONLY_OQFIX                        0x00000020
 
 #endif /* COMMON_XML */
index c27c1484cfa9ae5bfa820f616e67a32ef23a6664..421cb7cc0053893ea68baa755e1b9eab28591f6c 100644 (file)
@@ -1,4 +1,3 @@
-/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef STATE_XML
 #define STATE_XML
 
@@ -9,14 +8,40 @@ 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    (  18882 bytes, from 2015-03-25 11:42:32)
-- common.xml   (  18437 bytes, from 2015-03-25 11:27:41)
-- state_hi.xml (  23420 bytes, from 2015-03-25 11:47:21)
-- state_2d.xml (  51549 bytes, from 2015-03-25 11:25:06)
-- state_3d.xml (  54600 bytes, from 2015-03-25 11:25:19)
-- state_vg.xml (   5973 bytes, from 2015-03-25 11:26:01)
-
-Copyright (C) 2015
+- state.xml     (  26087 bytes, from 2017-12-18 16:51:59)
+- common.xml    (  35468 bytes, from 2018-01-22 13:48:54)
+- common_3d.xml (  14615 bytes, from 2017-12-18 16:51:59)
+- state_hi.xml  (  30232 bytes, from 2018-02-15 15:48:01)
+- copyright.xml (   1597 bytes, from 2016-12-08 16:37:56)
+- state_2d.xml  (  51552 bytes, from 2016-12-08 16:37:56)
+- state_3d.xml  (  79992 bytes, from 2017-12-18 16:51:59)
+- state_blt.xml (  13405 bytes, from 2017-12-18 16:51:59)
+- state_vg.xml  (   5975 bytes, from 2016-12-08 16:37:56)
+
+Copyright (C) 2012-2017 by the following authors:
+- Wladimir J. van der Laan <laanwj@gmail.com>
+- Christian Gmeiner <christian.gmeiner@gmail.com>
+- Lucas Stach <l.stach@pengutronix.de>
+- Russell King <rmk@arm.linux.org.uk>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sub license,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
 */
 
 
@@ -24,9 +49,25 @@ Copyright (C) 2015
 #define VARYING_COMPONENT_USE_USED                             0x00000001
 #define VARYING_COMPONENT_USE_POINTCOORD_X                     0x00000002
 #define VARYING_COMPONENT_USE_POINTCOORD_Y                     0x00000003
+#define FE_DATA_TYPE_BYTE                                      0x00000000
+#define FE_DATA_TYPE_UNSIGNED_BYTE                             0x00000001
+#define FE_DATA_TYPE_SHORT                                     0x00000002
+#define FE_DATA_TYPE_UNSIGNED_SHORT                            0x00000003
+#define FE_DATA_TYPE_INT                                       0x00000004
+#define FE_DATA_TYPE_UNSIGNED_INT                              0x00000005
+#define FE_DATA_TYPE_FLOAT                                     0x00000008
+#define FE_DATA_TYPE_HALF_FLOAT                                        0x00000009
+#define FE_DATA_TYPE_FIXED                                     0x0000000b
+#define FE_DATA_TYPE_INT_10_10_10_2                            0x0000000c
+#define FE_DATA_TYPE_UNSIGNED_INT_10_10_10_2                   0x0000000d
+#define FE_DATA_TYPE_BYTE_I                                    0x0000000e
+#define FE_DATA_TYPE_SHORT_I                                   0x0000000f
 #define FE_VERTEX_STREAM_CONTROL_VERTEX_STRIDE__MASK           0x000000ff
 #define FE_VERTEX_STREAM_CONTROL_VERTEX_STRIDE__SHIFT          0
 #define FE_VERTEX_STREAM_CONTROL_VERTEX_STRIDE(x)              (((x) << FE_VERTEX_STREAM_CONTROL_VERTEX_STRIDE__SHIFT) & FE_VERTEX_STREAM_CONTROL_VERTEX_STRIDE__MASK)
+#define FE_VERTEX_STREAM_CONTROL_VERTEX_DIVISOR__MASK          0x00ff0000
+#define FE_VERTEX_STREAM_CONTROL_VERTEX_DIVISOR__SHIFT         16
+#define FE_VERTEX_STREAM_CONTROL_VERTEX_DIVISOR(x)             (((x) << FE_VERTEX_STREAM_CONTROL_VERTEX_DIVISOR__SHIFT) & FE_VERTEX_STREAM_CONTROL_VERTEX_DIVISOR__MASK)
 #define VIVS_FE                                                        0x00000000
 
 #define VIVS_FE_VERTEX_ELEMENT_CONFIG(i0)                     (0x00000600 + 0x4*(i0))
@@ -34,17 +75,7 @@ Copyright (C) 2015
 #define VIVS_FE_VERTEX_ELEMENT_CONFIG__LEN                     0x00000010
 #define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE__MASK               0x0000000f
 #define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE__SHIFT              0
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_BYTE                        0x00000000
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_UNSIGNED_BYTE       0x00000001
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_SHORT               0x00000002
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_UNSIGNED_SHORT      0x00000003
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_INT                 0x00000004
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_UNSIGNED_INT                0x00000005
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_FLOAT               0x00000008
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_HALF_FLOAT          0x00000009
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_FIXED               0x0000000b
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_INT_10_10_10_2      0x0000000c
-#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE_UNSIGNED_INT_10_10_10_2     0x0000000d
+#define VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE(x)                  (((x) << VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE__SHIFT) & VIVS_FE_VERTEX_ELEMENT_CONFIG_TYPE__MASK)
 #define VIVS_FE_VERTEX_ELEMENT_CONFIG_ENDIAN__MASK             0x00000030
 #define VIVS_FE_VERTEX_ELEMENT_CONFIG_ENDIAN__SHIFT            4
 #define VIVS_FE_VERTEX_ELEMENT_CONFIG_ENDIAN(x)                        (((x) << VIVS_FE_VERTEX_ELEMENT_CONFIG_ENDIAN__SHIFT) & VIVS_FE_VERTEX_ELEMENT_CONFIG_ENDIAN__MASK)
@@ -76,6 +107,7 @@ Copyright (C) 2015
 #define VIVS_FE_INDEX_STREAM_CONTROL_TYPE_UNSIGNED_CHAR                0x00000000
 #define VIVS_FE_INDEX_STREAM_CONTROL_TYPE_UNSIGNED_SHORT       0x00000001
 #define VIVS_FE_INDEX_STREAM_CONTROL_TYPE_UNSIGNED_INT         0x00000002
+#define VIVS_FE_INDEX_STREAM_CONTROL_PRIMITIVE_RESTART         0x00000100
 
 #define VIVS_FE_VERTEX_STREAM_BASE_ADDR                                0x0000064c
 
@@ -151,6 +183,8 @@ Copyright (C) 2015
 
 #define VIVS_FE_AUTO_FLUSH                                     0x00000670
 
+#define VIVS_FE_PRIMITIVE_RESTART_INDEX                                0x00000674
+
 #define VIVS_FE_UNK00678                                       0x00000678
 
 #define VIVS_FE_UNK0067C                                       0x0000067c
@@ -163,17 +197,40 @@ Copyright (C) 2015
 
 #define VIVS_FE_VERTEX_STREAMS_CONTROL(i0)                    (0x000006a0 + 0x4*(i0))
 
-#define VIVS_FE_UNK00700(i0)                                  (0x00000700 + 0x4*(i0))
-#define VIVS_FE_UNK00700__ESIZE                                        0x00000004
-#define VIVS_FE_UNK00700__LEN                                  0x00000010
+#define VIVS_FE_GENERIC_ATTRIB(i0)                            (0x00000000 + 0x4*(i0))
+#define VIVS_FE_GENERIC_ATTRIB__ESIZE                          0x00000004
+#define VIVS_FE_GENERIC_ATTRIB__LEN                            0x00000010
+
+#define VIVS_FE_GENERIC_ATTRIB_UNK006C0(i0)                   (0x000006c0 + 0x4*(i0))
+
+#define VIVS_FE_GENERIC_ATTRIB_UNK00700(i0)                   (0x00000700 + 0x4*(i0))
+
+#define VIVS_FE_GENERIC_ATTRIB_UNK00740(i0)                   (0x00000740 + 0x4*(i0))
+
+#define VIVS_FE_GENERIC_ATTRIB_SCALE(i0)                      (0x00000780 + 0x4*(i0))
+
+#define VIVS_FE_HALTI5_UNK007C4                                        0x000007c4
+
+#define VIVS_FE_HALTI5_UNK007D0(i0)                           (0x000007d0 + 0x4*(i0))
+#define VIVS_FE_HALTI5_UNK007D0__ESIZE                         0x00000004
+#define VIVS_FE_HALTI5_UNK007D0__LEN                           0x00000002
+
+#define VIVS_FE_HALTI5_UNK007D8                                        0x000007d8
+
+#define VIVS_FE_DESC_START                                     0x000007dc
+
+#define VIVS_FE_DESC_END                                       0x000007e0
+
+#define VIVS_FE_DESC_AVAIL                                     0x000007e4
+#define VIVS_FE_DESC_AVAIL_COUNT__MASK                         0x0000007f
+#define VIVS_FE_DESC_AVAIL_COUNT__SHIFT                                0
+#define VIVS_FE_DESC_AVAIL_COUNT(x)                            (((x) << VIVS_FE_DESC_AVAIL_COUNT__SHIFT) & VIVS_FE_DESC_AVAIL_COUNT__MASK)
+
+#define VIVS_FE_FENCE_WAIT_DATA_LOW                            0x000007e8
 
-#define VIVS_FE_UNK00740(i0)                                  (0x00000740 + 0x4*(i0))
-#define VIVS_FE_UNK00740__ESIZE                                        0x00000004
-#define VIVS_FE_UNK00740__LEN                                  0x00000010
+#define VIVS_FE_FENCE_WAIT_DATA_HIGH                           0x000007f4
 
-#define VIVS_FE_UNK00780(i0)                                  (0x00000780 + 0x4*(i0))
-#define VIVS_FE_UNK00780__ESIZE                                        0x00000004
-#define VIVS_FE_UNK00780__LEN                                  0x00000010
+#define VIVS_FE_ROBUSTNESS_UNK007F8                            0x000007f8
 
 #define VIVS_GL                                                        0x00000000
 
@@ -188,6 +245,7 @@ Copyright (C) 2015
 #define VIVS_GL_EVENT_EVENT_ID(x)                              (((x) << VIVS_GL_EVENT_EVENT_ID__SHIFT) & VIVS_GL_EVENT_EVENT_ID__MASK)
 #define VIVS_GL_EVENT_FROM_FE                                  0x00000020
 #define VIVS_GL_EVENT_FROM_PE                                  0x00000040
+#define VIVS_GL_EVENT_FROM_BLT                                 0x00000080
 #define VIVS_GL_EVENT_SOURCE__MASK                             0x00001f00
 #define VIVS_GL_EVENT_SOURCE__SHIFT                            8
 #define VIVS_GL_EVENT_SOURCE(x)                                        (((x) << VIVS_GL_EVENT_SOURCE__SHIFT) & VIVS_GL_EVENT_SOURCE__MASK)
@@ -199,6 +257,9 @@ Copyright (C) 2015
 #define VIVS_GL_SEMAPHORE_TOKEN_TO__MASK                       0x00001f00
 #define VIVS_GL_SEMAPHORE_TOKEN_TO__SHIFT                      8
 #define VIVS_GL_SEMAPHORE_TOKEN_TO(x)                          (((x) << VIVS_GL_SEMAPHORE_TOKEN_TO__SHIFT) & VIVS_GL_SEMAPHORE_TOKEN_TO__MASK)
+#define VIVS_GL_SEMAPHORE_TOKEN_UNK28__MASK                    0x30000000
+#define VIVS_GL_SEMAPHORE_TOKEN_UNK28__SHIFT                   28
+#define VIVS_GL_SEMAPHORE_TOKEN_UNK28(x)                       (((x) << VIVS_GL_SEMAPHORE_TOKEN_UNK28__SHIFT) & VIVS_GL_SEMAPHORE_TOKEN_UNK28__MASK)
 
 #define VIVS_GL_FLUSH_CACHE                                    0x0000380c
 #define VIVS_GL_FLUSH_CACHE_DEPTH                              0x00000001
@@ -208,6 +269,10 @@ Copyright (C) 2015
 #define VIVS_GL_FLUSH_CACHE_TEXTUREVS                          0x00000010
 #define VIVS_GL_FLUSH_CACHE_SHADER_L1                          0x00000020
 #define VIVS_GL_FLUSH_CACHE_SHADER_L2                          0x00000040
+#define VIVS_GL_FLUSH_CACHE_UNK10                              0x00000400
+#define VIVS_GL_FLUSH_CACHE_UNK11                              0x00000800
+#define VIVS_GL_FLUSH_CACHE_DESCRIPTOR_UNK12                   0x00001000
+#define VIVS_GL_FLUSH_CACHE_DESCRIPTOR_UNK13                   0x00002000
 
 #define VIVS_GL_FLUSH_MMU                                      0x00003810
 #define VIVS_GL_FLUSH_MMU_FLUSH_FEMMU                          0x00000001
@@ -244,30 +309,8 @@ Copyright (C) 2015
 #define VIVS_GL_VARYING_TOTAL_COMPONENTS_NUM(x)                        (((x) << VIVS_GL_VARYING_TOTAL_COMPONENTS_NUM__SHIFT) & VIVS_GL_VARYING_TOTAL_COMPONENTS_NUM__MASK)
 
 #define VIVS_GL_VARYING_NUM_COMPONENTS                         0x00003820
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR0__MASK              0x00000007
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR0__SHIFT             0
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR0(x)                 (((x) << VIVS_GL_VARYING_NUM_COMPONENTS_VAR0__SHIFT) & VIVS_GL_VARYING_NUM_COMPONENTS_VAR0__MASK)
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR1__MASK              0x00000070
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR1__SHIFT             4
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR1(x)                 (((x) << VIVS_GL_VARYING_NUM_COMPONENTS_VAR1__SHIFT) & VIVS_GL_VARYING_NUM_COMPONENTS_VAR1__MASK)
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR2__MASK              0x00000700
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR2__SHIFT             8
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR2(x)                 (((x) << VIVS_GL_VARYING_NUM_COMPONENTS_VAR2__SHIFT) & VIVS_GL_VARYING_NUM_COMPONENTS_VAR2__MASK)
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR3__MASK              0x00007000
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR3__SHIFT             12
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR3(x)                 (((x) << VIVS_GL_VARYING_NUM_COMPONENTS_VAR3__SHIFT) & VIVS_GL_VARYING_NUM_COMPONENTS_VAR3__MASK)
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR4__MASK              0x00070000
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR4__SHIFT             16
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR4(x)                 (((x) << VIVS_GL_VARYING_NUM_COMPONENTS_VAR4__SHIFT) & VIVS_GL_VARYING_NUM_COMPONENTS_VAR4__MASK)
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR5__MASK              0x00700000
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR5__SHIFT             20
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR5(x)                 (((x) << VIVS_GL_VARYING_NUM_COMPONENTS_VAR5__SHIFT) & VIVS_GL_VARYING_NUM_COMPONENTS_VAR5__MASK)
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR6__MASK              0x07000000
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR6__SHIFT             24
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR6(x)                 (((x) << VIVS_GL_VARYING_NUM_COMPONENTS_VAR6__SHIFT) & VIVS_GL_VARYING_NUM_COMPONENTS_VAR6__MASK)
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR7__MASK              0x70000000
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR7__SHIFT             28
-#define VIVS_GL_VARYING_NUM_COMPONENTS_VAR7(x)                 (((x) << VIVS_GL_VARYING_NUM_COMPONENTS_VAR7__SHIFT) & VIVS_GL_VARYING_NUM_COMPONENTS_VAR7__MASK)
+
+#define VIVS_GL_OCCLUSION_QUERY_ADDR                           0x00003824
 
 #define VIVS_GL_VARYING_COMPONENT_USE(i0)                     (0x00003828 + 0x4*(i0))
 #define VIVS_GL_VARYING_COMPONENT_USE__ESIZE                   0x00000004
@@ -321,6 +364,10 @@ Copyright (C) 2015
 #define VIVS_GL_VARYING_COMPONENT_USE_COMP15__SHIFT            30
 #define VIVS_GL_VARYING_COMPONENT_USE_COMP15(x)                        (((x) << VIVS_GL_VARYING_COMPONENT_USE_COMP15__SHIFT) & VIVS_GL_VARYING_COMPONENT_USE_COMP15__MASK)
 
+#define VIVS_GL_UNK0382C                                       0x0000382c
+
+#define VIVS_GL_OCCLUSION_QUERY_CONTROL                                0x00003830
+
 #define VIVS_GL_UNK03834                                       0x00003834
 
 #define VIVS_GL_UNK03838                                       0x00003838
@@ -332,8 +379,58 @@ Copyright (C) 2015
 
 #define VIVS_GL_CONTEXT_POINTER                                        0x00003850
 
+#define VIVS_GL_UNK03854                                       0x00003854
+
+#define VIVS_GL_BUG_FIXES                                      0x00003860
+
+#define VIVS_GL_FENCE_OUT_ADDRESS                              0x00003868
+
+#define VIVS_GL_FENCE_OUT_DATA_LOW                             0x0000386c
+
+#define VIVS_GL_HALTI5_UNK03884                                        0x00003884
+
+#define VIVS_GL_HALTI5_SH_SPECIALS                             0x00003888
+#define VIVS_GL_HALTI5_SH_SPECIALS_VS_PSIZE_OUT__MASK          0x0000007f
+#define VIVS_GL_HALTI5_SH_SPECIALS_VS_PSIZE_OUT__SHIFT         0
+#define VIVS_GL_HALTI5_SH_SPECIALS_VS_PSIZE_OUT(x)             (((x) << VIVS_GL_HALTI5_SH_SPECIALS_VS_PSIZE_OUT__SHIFT) & VIVS_GL_HALTI5_SH_SPECIALS_VS_PSIZE_OUT__MASK)
+#define VIVS_GL_HALTI5_SH_SPECIALS_PS_PCOORD_IN__MASK          0x00007f00
+#define VIVS_GL_HALTI5_SH_SPECIALS_PS_PCOORD_IN__SHIFT         8
+#define VIVS_GL_HALTI5_SH_SPECIALS_PS_PCOORD_IN(x)             (((x) << VIVS_GL_HALTI5_SH_SPECIALS_PS_PCOORD_IN__SHIFT) & VIVS_GL_HALTI5_SH_SPECIALS_PS_PCOORD_IN__MASK)
+#define VIVS_GL_HALTI5_SH_SPECIALS_UNK16__MASK                 0x007f0000
+#define VIVS_GL_HALTI5_SH_SPECIALS_UNK16__SHIFT                        16
+#define VIVS_GL_HALTI5_SH_SPECIALS_UNK16(x)                    (((x) << VIVS_GL_HALTI5_SH_SPECIALS_UNK16__SHIFT) & VIVS_GL_HALTI5_SH_SPECIALS_UNK16__MASK)
+#define VIVS_GL_HALTI5_SH_SPECIALS_UNK24__MASK                 0xff000000
+#define VIVS_GL_HALTI5_SH_SPECIALS_UNK24__SHIFT                        24
+#define VIVS_GL_HALTI5_SH_SPECIALS_UNK24(x)                    (((x) << VIVS_GL_HALTI5_SH_SPECIALS_UNK24__SHIFT) & VIVS_GL_HALTI5_SH_SPECIALS_UNK24__MASK)
+
+#define VIVS_GL_GS_UNK0388C                                    0x0000388c
+
+#define VIVS_GL_FENCE_OUT_DATA_HIGH                            0x00003898
+
+#define VIVS_GL_SHADER_INDEX                                   0x0000389c
+
+#define VIVS_GL_GS_UNK038A0(i0)                                       (0x000038a0 + 0x4*(i0))
+#define VIVS_GL_GS_UNK038A0__ESIZE                             0x00000004
+#define VIVS_GL_GS_UNK038A0__LEN                               0x00000008
+
+#define VIVS_GL_HALTI5_UNK038C0(i0)                           (0x000038c0 + 0x4*(i0))
+#define VIVS_GL_HALTI5_UNK038C0__ESIZE                         0x00000004
+#define VIVS_GL_HALTI5_UNK038C0__LEN                           0x00000010
+
+#define VIVS_GL_SECURITY_UNK3900                               0x00003900
+
+#define VIVS_GL_SECURITY_UNK3904                               0x00003904
+
 #define VIVS_GL_UNK03A00                                       0x00003a00
 
+#define VIVS_GL_UNK03A04                                       0x00003a04
+
+#define VIVS_GL_UNK03A08                                       0x00003a08
+
+#define VIVS_GL_UNK03A0C                                       0x00003a0c
+
+#define VIVS_GL_UNK03A10                                       0x00003a10
+
 #define VIVS_GL_STALL_TOKEN                                    0x00003c00
 #define VIVS_GL_STALL_TOKEN_FROM__MASK                         0x0000001f
 #define VIVS_GL_STALL_TOKEN_FROM__SHIFT                                0
@@ -344,6 +441,59 @@ Copyright (C) 2015
 #define VIVS_GL_STALL_TOKEN_FLIP0                              0x40000000
 #define VIVS_GL_STALL_TOKEN_FLIP1                              0x80000000
 
+#define VIVS_NFE                                               0x00000000
+
+#define VIVS_NFE_VERTEX_STREAMS(i0)                           (0x00000000 + 0x4*(i0))
+#define VIVS_NFE_VERTEX_STREAMS__ESIZE                         0x00000004
+#define VIVS_NFE_VERTEX_STREAMS__LEN                           0x00000010
+
+#define VIVS_NFE_VERTEX_STREAMS_BASE_ADDR(i0)                 (0x00014600 + 0x4*(i0))
+
+#define VIVS_NFE_VERTEX_STREAMS_CONTROL(i0)                   (0x00014640 + 0x4*(i0))
+
+#define VIVS_NFE_VERTEX_STREAMS_UNK14680(i0)                  (0x00014680 + 0x4*(i0))
+
+#define VIVS_NFE_VERTEX_STREAMS_ROBUSTNESS_UNK146C0(i0)               (0x000146c0 + 0x4*(i0))
+
+#define VIVS_NFE_GENERIC_ATTRIB(i0)                           (0x00000000 + 0x4*(i0))
+#define VIVS_NFE_GENERIC_ATTRIB__ESIZE                         0x00000004
+#define VIVS_NFE_GENERIC_ATTRIB__LEN                           0x00000020
+
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0(i0)                   (0x00017800 + 0x4*(i0))
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_TYPE__MASK             0x0000000f
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_TYPE__SHIFT            0
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_TYPE(x)                        (((x) << VIVS_NFE_GENERIC_ATTRIB_CONFIG0_TYPE__SHIFT) & VIVS_NFE_GENERIC_ATTRIB_CONFIG0_TYPE__MASK)
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_ENDIAN__MASK           0x00000030
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_ENDIAN__SHIFT          4
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_ENDIAN(x)              (((x) << VIVS_NFE_GENERIC_ATTRIB_CONFIG0_ENDIAN__SHIFT) & VIVS_NFE_GENERIC_ATTRIB_CONFIG0_ENDIAN__MASK)
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM__MASK           0x00000700
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM__SHIFT          8
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM(x)              (((x) << VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM__SHIFT) & VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM__MASK)
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_NUM__MASK              0x00003000
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_NUM__SHIFT             12
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_NUM(x)                 (((x) << VIVS_NFE_GENERIC_ATTRIB_CONFIG0_NUM__SHIFT) & VIVS_NFE_GENERIC_ATTRIB_CONFIG0_NUM__MASK)
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_NORMALIZE__MASK                0x0000c000
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_NORMALIZE__SHIFT       14
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_NORMALIZE_OFF          0x00000000
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_NORMALIZE_ON           0x00008000
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_START__MASK            0x00ff0000
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_START__SHIFT           16
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_START(x)               (((x) << VIVS_NFE_GENERIC_ATTRIB_CONFIG0_START__SHIFT) & VIVS_NFE_GENERIC_ATTRIB_CONFIG0_START__MASK)
+
+#define VIVS_NFE_GENERIC_ATTRIB_UNK17880(i0)                  (0x00017880 + 0x4*(i0))
+
+#define VIVS_NFE_GENERIC_ATTRIB_UNK17900(i0)                  (0x00017900 + 0x4*(i0))
+
+#define VIVS_NFE_GENERIC_ATTRIB_UNK17980(i0)                  (0x00017980 + 0x4*(i0))
+
+#define VIVS_NFE_GENERIC_ATTRIB_SCALE(i0)                     (0x00017a00 + 0x4*(i0))
+
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG1(i0)                   (0x00017a80 + 0x4*(i0))
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG1_END__MASK              0x000000ff
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG1_END__SHIFT             0
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG1_END(x)                 (((x) << VIVS_NFE_GENERIC_ATTRIB_CONFIG1_END__SHIFT) & VIVS_NFE_GENERIC_ATTRIB_CONFIG1_END__MASK)
+#define VIVS_NFE_GENERIC_ATTRIB_CONFIG1_NONCONSECUTIVE         0x00000800
+
 #define VIVS_DUMMY                                             0x00000000
 
 #define VIVS_DUMMY_DUMMY                                       0x0003fffc
index 73a97d35c51b78cad31cf73f03095e0dff4993ca..ebbd4fcf3096be004bcf366e50c8009de37a1214 100644 (file)
@@ -7,4 +7,9 @@
 #define VIVS_TS_FLUSH_CACHE                                    0x00001650
 #define VIVS_TS_FLUSH_CACHE_FLUSH                              0x00000001
 
+#define VIVS_NTE_DESCRIPTOR_FLUSH                              0x00014c44
+#define VIVS_NTE_DESCRIPTOR_FLUSH_UNK28__MASK                  0xf0000000
+#define VIVS_NTE_DESCRIPTOR_FLUSH_UNK28__SHIFT                 28
+#define VIVS_NTE_DESCRIPTOR_FLUSH_UNK28(x)                     (((x) << VIVS_NTE_DESCRIPTOR_FLUSH_UNK28__SHIFT) & VIVS_NTE_DESCRIPTOR_FLUSH_UNK28__MASK)
+
 #endif /* STATE_3D_XML */
diff --git a/drivers/gpu/drm/etnaviv/state_blt.xml.h b/drivers/gpu/drm/etnaviv/state_blt.xml.h
new file mode 100644 (file)
index 0000000..daae559
--- /dev/null
@@ -0,0 +1,52 @@
+#ifndef STATE_BLT_XML
+#define STATE_BLT_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+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     (  26087 bytes, from 2017-12-18 16:51:59)
+- common.xml    (  35468 bytes, from 2018-01-22 13:48:54)
+- common_3d.xml (  14615 bytes, from 2017-12-18 16:51:59)
+- state_hi.xml  (  30232 bytes, from 2018-02-15 15:48:01)
+- copyright.xml (   1597 bytes, from 2016-12-08 16:37:56)
+- state_2d.xml  (  51552 bytes, from 2016-12-08 16:37:56)
+- state_3d.xml  (  79992 bytes, from 2017-12-18 16:51:59)
+- state_blt.xml (  13405 bytes, from 2017-12-18 16:51:59)
+- state_vg.xml  (   5975 bytes, from 2016-12-08 16:37:56)
+
+Copyright (C) 2012-2017 by the following authors:
+- Wladimir J. van der Laan <laanwj@gmail.com>
+- Christian Gmeiner <christian.gmeiner@gmail.com>
+- Lucas Stach <l.stach@pengutronix.de>
+- Russell King <rmk@arm.linux.org.uk>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sub license,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
+/* This is a cut-down version of the state_blt.xml.h file */
+
+#define VIVS_BLT_ENABLE                                                0x000140b8
+#define VIVS_BLT_ENABLE_ENABLE                                 0x00000001
+
+#endif /* STATE_BLT_XML */
index 60808daf7e8d6ab78a2cb22d6b0f54550d6357df..41d8da2b6f4fc048919515be517076adcbb8f7e0 100644 (file)
@@ -1,4 +1,3 @@
-/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef STATE_HI_XML
 #define STATE_HI_XML
 
@@ -9,10 +8,40 @@ 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_hi.xml (  25620 bytes, from 2016-08-19 22:07:37)
-- common.xml   (  20583 bytes, from 2016-06-07 05:22:38)
-
-Copyright (C) 2016
+- state.xml     (  26087 bytes, from 2017-12-18 16:51:59)
+- common.xml    (  35468 bytes, from 2018-01-22 13:48:54)
+- common_3d.xml (  14615 bytes, from 2017-12-18 16:51:59)
+- state_hi.xml  (  30232 bytes, from 2018-02-15 15:48:01)
+- copyright.xml (   1597 bytes, from 2016-12-08 16:37:56)
+- state_2d.xml  (  51552 bytes, from 2016-12-08 16:37:56)
+- state_3d.xml  (  79992 bytes, from 2017-12-18 16:51:59)
+- state_blt.xml (  13405 bytes, from 2017-12-18 16:51:59)
+- state_vg.xml  (   5975 bytes, from 2016-12-08 16:37:56)
+
+Copyright (C) 2012-2018 by the following authors:
+- Wladimir J. van der Laan <laanwj@gmail.com>
+- Christian Gmeiner <christian.gmeiner@gmail.com>
+- Lucas Stach <l.stach@pengutronix.de>
+- Russell King <rmk@arm.linux.org.uk>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sub license,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
 */
 
 
@@ -192,6 +221,9 @@ Copyright (C) 2016
 #define VIVS_HI_CHIP_SPECS_3_GPU_CORE_COUNT__SHIFT             0
 #define VIVS_HI_CHIP_SPECS_3_GPU_CORE_COUNT(x)                 (((x) << VIVS_HI_CHIP_SPECS_3_GPU_CORE_COUNT__SHIFT) & VIVS_HI_CHIP_SPECS_3_GPU_CORE_COUNT__MASK)
 
+#define VIVS_HI_COMPRESSION_FLAGS                              0x00000090
+#define VIVS_HI_COMPRESSION_FLAGS_DEC300                       0x00000040
+
 #define VIVS_HI_CHIP_MINOR_FEATURE_4                           0x00000094
 
 #define VIVS_HI_CHIP_SPECS_4                                   0x0000009c
@@ -203,6 +235,10 @@ Copyright (C) 2016
 
 #define VIVS_HI_CHIP_PRODUCT_ID                                        0x000000a8
 
+#define VIVS_HI_BLT_INTR                                       0x000000d4
+
+#define VIVS_HI_AUXBIT                                         0x000000ec
+
 #define VIVS_PM                                                        0x00000000
 
 #define VIVS_PM_POWER_CONTROLS                                 0x00000100
@@ -239,6 +275,17 @@ Copyright (C) 2016
 #define VIVS_PM_MODULE_STATUS_MODULE_CLOCK_GATED_TX            0x00000080
 
 #define VIVS_PM_PULSE_EATER                                    0x0000010c
+#define VIVS_PM_PULSE_EATER_DISABLE                            0x00000001
+#define VIVS_PM_PULSE_EATER_DVFS_PERIOD__MASK                  0x0000ff00
+#define VIVS_PM_PULSE_EATER_DVFS_PERIOD__SHIFT                 8
+#define VIVS_PM_PULSE_EATER_DVFS_PERIOD(x)                     (((x) << VIVS_PM_PULSE_EATER_DVFS_PERIOD__SHIFT) & VIVS_PM_PULSE_EATER_DVFS_PERIOD__MASK)
+#define VIVS_PM_PULSE_EATER_UNK16                              0x00010000
+#define VIVS_PM_PULSE_EATER_UNK17                              0x00020000
+#define VIVS_PM_PULSE_EATER_INTERNAL_DFS                       0x00040000
+#define VIVS_PM_PULSE_EATER_UNK19                              0x00080000
+#define VIVS_PM_PULSE_EATER_UNK20                              0x00100000
+#define VIVS_PM_PULSE_EATER_UNK22                              0x00400000
+#define VIVS_PM_PULSE_EATER_UNK23                              0x00800000
 
 #define VIVS_MMUv2                                             0x00000000
 
@@ -280,6 +327,68 @@ Copyright (C) 2016
 #define VIVS_MMUv2_EXCEPTION_ADDR__ESIZE                       0x00000004
 #define VIVS_MMUv2_EXCEPTION_ADDR__LEN                         0x00000004
 
+#define VIVS_MMUv2_PROFILE_BLT_READ                            0x000001a4
+
+#define VIVS_MMUv2_PTA_CONFIG                                  0x000001ac
+#define VIVS_MMUv2_PTA_CONFIG_INDEX__MASK                      0x0000ffff
+#define VIVS_MMUv2_PTA_CONFIG_INDEX__SHIFT                     0
+#define VIVS_MMUv2_PTA_CONFIG_INDEX(x)                         (((x) << VIVS_MMUv2_PTA_CONFIG_INDEX__SHIFT) & VIVS_MMUv2_PTA_CONFIG_INDEX__MASK)
+#define VIVS_MMUv2_PTA_CONFIG_UNK16                            0x00010000
+
+#define VIVS_MMUv2_AXI_POLICY(i0)                             (0x000001c0 + 0x4*(i0))
+#define VIVS_MMUv2_AXI_POLICY__ESIZE                           0x00000004
+#define VIVS_MMUv2_AXI_POLICY__LEN                             0x00000008
+
+#define VIVS_MMUv2_SEC_EXCEPTION_ADDR                          0x00000380
+
+#define VIVS_MMUv2_SEC_STATUS                                  0x00000384
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION0__MASK                 0x00000003
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION0__SHIFT                        0
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION0(x)                    (((x) << VIVS_MMUv2_SEC_STATUS_EXCEPTION0__SHIFT) & VIVS_MMUv2_SEC_STATUS_EXCEPTION0__MASK)
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION1__MASK                 0x00000030
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION1__SHIFT                        4
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION1(x)                    (((x) << VIVS_MMUv2_SEC_STATUS_EXCEPTION1__SHIFT) & VIVS_MMUv2_SEC_STATUS_EXCEPTION1__MASK)
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION2__MASK                 0x00000300
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION2__SHIFT                        8
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION2(x)                    (((x) << VIVS_MMUv2_SEC_STATUS_EXCEPTION2__SHIFT) & VIVS_MMUv2_SEC_STATUS_EXCEPTION2__MASK)
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION3__MASK                 0x00003000
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION3__SHIFT                        12
+#define VIVS_MMUv2_SEC_STATUS_EXCEPTION3(x)                    (((x) << VIVS_MMUv2_SEC_STATUS_EXCEPTION3__SHIFT) & VIVS_MMUv2_SEC_STATUS_EXCEPTION3__MASK)
+
+#define VIVS_MMUv2_SEC_CONTROL                                 0x00000388
+#define VIVS_MMUv2_SEC_CONTROL_ENABLE                          0x00000001
+
+#define VIVS_MMUv2_PTA_ADDRESS_LOW                             0x0000038c
+
+#define VIVS_MMUv2_PTA_ADDRESS_HIGH                            0x00000390
+
+#define VIVS_MMUv2_PTA_CONTROL                                 0x00000394
+#define VIVS_MMUv2_PTA_CONTROL_ENABLE                          0x00000001
+
+#define VIVS_MMUv2_NONSEC_SAFE_ADDR_LOW                                0x00000398
+
+#define VIVS_MMUv2_SEC_SAFE_ADDR_LOW                           0x0000039c
+
+#define VIVS_MMUv2_SAFE_ADDRESS_CONFIG                         0x000003a0
+#define VIVS_MMUv2_SAFE_ADDRESS_CONFIG_NON_SEC_SAFE_ADDR_HIGH__MASK    0x000000ff
+#define VIVS_MMUv2_SAFE_ADDRESS_CONFIG_NON_SEC_SAFE_ADDR_HIGH__SHIFT   0
+#define VIVS_MMUv2_SAFE_ADDRESS_CONFIG_NON_SEC_SAFE_ADDR_HIGH(x)       (((x) << VIVS_MMUv2_SAFE_ADDRESS_CONFIG_NON_SEC_SAFE_ADDR_HIGH__SHIFT) & VIVS_MMUv2_SAFE_ADDRESS_CONFIG_NON_SEC_SAFE_ADDR_HIGH__MASK)
+#define VIVS_MMUv2_SAFE_ADDRESS_CONFIG_UNK15                   0x00008000
+#define VIVS_MMUv2_SAFE_ADDRESS_CONFIG_SEC_SAFE_ADDR_HIGH__MASK        0x00ff0000
+#define VIVS_MMUv2_SAFE_ADDRESS_CONFIG_SEC_SAFE_ADDR_HIGH__SHIFT       16
+#define VIVS_MMUv2_SAFE_ADDRESS_CONFIG_SEC_SAFE_ADDR_HIGH(x)   (((x) << VIVS_MMUv2_SAFE_ADDRESS_CONFIG_SEC_SAFE_ADDR_HIGH__SHIFT) & VIVS_MMUv2_SAFE_ADDRESS_CONFIG_SEC_SAFE_ADDR_HIGH__MASK)
+#define VIVS_MMUv2_SAFE_ADDRESS_CONFIG_UNK31                   0x80000000
+
+#define VIVS_MMUv2_SEC_COMMAND_CONTROL                         0x000003a4
+#define VIVS_MMUv2_SEC_COMMAND_CONTROL_PREFETCH__MASK          0x0000ffff
+#define VIVS_MMUv2_SEC_COMMAND_CONTROL_PREFETCH__SHIFT         0
+#define VIVS_MMUv2_SEC_COMMAND_CONTROL_PREFETCH(x)             (((x) << VIVS_MMUv2_SEC_COMMAND_CONTROL_PREFETCH__SHIFT) & VIVS_MMUv2_SEC_COMMAND_CONTROL_PREFETCH__MASK)
+#define VIVS_MMUv2_SEC_COMMAND_CONTROL_ENABLE                  0x00010000
+
+#define VIVS_MMUv2_AHB_CONTROL                                 0x000003a8
+#define VIVS_MMUv2_AHB_CONTROL_RESET                           0x00000001
+#define VIVS_MMUv2_AHB_CONTROL_NONSEC_ACCESS                   0x00000002
+
 #define VIVS_MC                                                        0x00000000
 
 #define VIVS_MC_MMU_FE_PAGE_TABLE                              0x00000400
@@ -340,13 +449,13 @@ Copyright (C) 2016
 #define VIVS_MC_PROFILE_HI_READ                                        0x0000046c
 
 #define VIVS_MC_PROFILE_CONFIG0                                        0x00000470
-#define VIVS_MC_PROFILE_CONFIG0_FE__MASK                       0x0000000f
+#define VIVS_MC_PROFILE_CONFIG0_FE__MASK                       0x000000ff
 #define VIVS_MC_PROFILE_CONFIG0_FE__SHIFT                      0
 #define VIVS_MC_PROFILE_CONFIG0_FE_RESET                       0x0000000f
-#define VIVS_MC_PROFILE_CONFIG0_DE__MASK                       0x00000f00
+#define VIVS_MC_PROFILE_CONFIG0_DE__MASK                       0x0000ff00
 #define VIVS_MC_PROFILE_CONFIG0_DE__SHIFT                      8
 #define VIVS_MC_PROFILE_CONFIG0_DE_RESET                       0x00000f00
-#define VIVS_MC_PROFILE_CONFIG0_PE__MASK                       0x000f0000
+#define VIVS_MC_PROFILE_CONFIG0_PE__MASK                       0x00ff0000
 #define VIVS_MC_PROFILE_CONFIG0_PE__SHIFT                      16
 #define VIVS_MC_PROFILE_CONFIG0_PE_PIXEL_COUNT_KILLED_BY_COLOR_PIPE    0x00000000
 #define VIVS_MC_PROFILE_CONFIG0_PE_PIXEL_COUNT_KILLED_BY_DEPTH_PIPE    0x00010000
@@ -354,7 +463,7 @@ Copyright (C) 2016
 #define VIVS_MC_PROFILE_CONFIG0_PE_PIXEL_COUNT_DRAWN_BY_DEPTH_PIPE     0x00030000
 #define VIVS_MC_PROFILE_CONFIG0_PE_PIXELS_RENDERED_2D          0x000b0000
 #define VIVS_MC_PROFILE_CONFIG0_PE_RESET                       0x000f0000
-#define VIVS_MC_PROFILE_CONFIG0_SH__MASK                       0x0f000000
+#define VIVS_MC_PROFILE_CONFIG0_SH__MASK                       0xff000000
 #define VIVS_MC_PROFILE_CONFIG0_SH__SHIFT                      24
 #define VIVS_MC_PROFILE_CONFIG0_SH_SHADER_CYCLES               0x04000000
 #define VIVS_MC_PROFILE_CONFIG0_SH_PS_INST_COUNTER             0x07000000
@@ -368,7 +477,7 @@ Copyright (C) 2016
 #define VIVS_MC_PROFILE_CONFIG0_SH_RESET                       0x0f000000
 
 #define VIVS_MC_PROFILE_CONFIG1                                        0x00000474
-#define VIVS_MC_PROFILE_CONFIG1_PA__MASK                       0x0000000f
+#define VIVS_MC_PROFILE_CONFIG1_PA__MASK                       0x000000ff
 #define VIVS_MC_PROFILE_CONFIG1_PA__SHIFT                      0
 #define VIVS_MC_PROFILE_CONFIG1_PA_INPUT_VTX_COUNTER           0x00000003
 #define VIVS_MC_PROFILE_CONFIG1_PA_INPUT_PRIM_COUNTER          0x00000004
@@ -377,12 +486,12 @@ Copyright (C) 2016
 #define VIVS_MC_PROFILE_CONFIG1_PA_TRIVIAL_REJECTED_COUNTER    0x00000007
 #define VIVS_MC_PROFILE_CONFIG1_PA_CULLED_COUNTER              0x00000008
 #define VIVS_MC_PROFILE_CONFIG1_PA_RESET                       0x0000000f
-#define VIVS_MC_PROFILE_CONFIG1_SE__MASK                       0x00000f00
+#define VIVS_MC_PROFILE_CONFIG1_SE__MASK                       0x0000ff00
 #define VIVS_MC_PROFILE_CONFIG1_SE__SHIFT                      8
 #define VIVS_MC_PROFILE_CONFIG1_SE_CULLED_TRIANGLE_COUNT       0x00000000
 #define VIVS_MC_PROFILE_CONFIG1_SE_CULLED_LINES_COUNT          0x00000100
 #define VIVS_MC_PROFILE_CONFIG1_SE_RESET                       0x00000f00
-#define VIVS_MC_PROFILE_CONFIG1_RA__MASK                       0x000f0000
+#define VIVS_MC_PROFILE_CONFIG1_RA__MASK                       0x00ff0000
 #define VIVS_MC_PROFILE_CONFIG1_RA__SHIFT                      16
 #define VIVS_MC_PROFILE_CONFIG1_RA_VALID_PIXEL_COUNT           0x00000000
 #define VIVS_MC_PROFILE_CONFIG1_RA_TOTAL_QUAD_COUNT            0x00010000
@@ -392,7 +501,7 @@ Copyright (C) 2016
 #define VIVS_MC_PROFILE_CONFIG1_RA_PREFETCH_CACHE_MISS_COUNTER 0x000a0000
 #define VIVS_MC_PROFILE_CONFIG1_RA_CULLED_QUAD_COUNT           0x000b0000
 #define VIVS_MC_PROFILE_CONFIG1_RA_RESET                       0x000f0000
-#define VIVS_MC_PROFILE_CONFIG1_TX__MASK                       0x0f000000
+#define VIVS_MC_PROFILE_CONFIG1_TX__MASK                       0xff000000
 #define VIVS_MC_PROFILE_CONFIG1_TX__SHIFT                      24
 #define VIVS_MC_PROFILE_CONFIG1_TX_TOTAL_BILINEAR_REQUESTS     0x00000000
 #define VIVS_MC_PROFILE_CONFIG1_TX_TOTAL_TRILINEAR_REQUESTS    0x01000000
@@ -407,18 +516,21 @@ Copyright (C) 2016
 #define VIVS_MC_PROFILE_CONFIG1_TX_RESET                       0x0f000000
 
 #define VIVS_MC_PROFILE_CONFIG2                                        0x00000478
-#define VIVS_MC_PROFILE_CONFIG2_MC__MASK                       0x0000000f
+#define VIVS_MC_PROFILE_CONFIG2_MC__MASK                       0x000000ff
 #define VIVS_MC_PROFILE_CONFIG2_MC__SHIFT                      0
 #define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_READ_REQ_8B_FROM_PIPELINE     0x00000001
 #define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_READ_REQ_8B_FROM_IP   0x00000002
 #define VIVS_MC_PROFILE_CONFIG2_MC_TOTAL_WRITE_REQ_8B_FROM_PIPELINE    0x00000003
 #define VIVS_MC_PROFILE_CONFIG2_MC_RESET                       0x0000000f
-#define VIVS_MC_PROFILE_CONFIG2_HI__MASK                       0x00000f00
+#define VIVS_MC_PROFILE_CONFIG2_HI__MASK                       0x0000ff00
 #define VIVS_MC_PROFILE_CONFIG2_HI__SHIFT                      8
 #define VIVS_MC_PROFILE_CONFIG2_HI_AXI_CYCLES_READ_REQUEST_STALLED     0x00000000
 #define VIVS_MC_PROFILE_CONFIG2_HI_AXI_CYCLES_WRITE_REQUEST_STALLED    0x00000100
 #define VIVS_MC_PROFILE_CONFIG2_HI_AXI_CYCLES_WRITE_DATA_STALLED       0x00000200
 #define VIVS_MC_PROFILE_CONFIG2_HI_RESET                       0x00000f00
+#define VIVS_MC_PROFILE_CONFIG2_BLT__MASK                      0xff000000
+#define VIVS_MC_PROFILE_CONFIG2_BLT__SHIFT                     24
+#define VIVS_MC_PROFILE_CONFIG2_BLT_UNK0                       0x00000000
 
 #define VIVS_MC_PROFILE_CONFIG3                                        0x0000047c
 
@@ -432,7 +544,13 @@ Copyright (C) 2016
 
 #define VIVS_MC_START_COMPOSITION                              0x00000554
 
-#define VIVS_MC_128B_MERGE                                     0x00000558
+#define VIVS_MC_FLAGS                                          0x00000558
+#define VIVS_MC_FLAGS_128B_MERGE                               0x00000001
+#define VIVS_MC_FLAGS_TPCV11_COMPRESSION                       0x08000000
+
+#define VIVS_MC_L2_CACHE_CONFIG                                        0x0000055c
+
+#define VIVS_MC_PROFILE_L2_READ                                        0x00000564
 
 
 #endif /* STATE_HI_XML */