lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAH9NwWdXVCfzUy88n49g0ZqaC9KVLuw7Des9JpT5t1sif7qy5Q@mail.gmail.com>
Date: Thu, 25 Jan 2024 17:14:08 +0100
From: Christian Gmeiner <christian.gmeiner@...il.com>
To: Philipp Zabel <p.zabel@...gutronix.de>
Cc: Lucas Stach <l.stach@...gutronix.de>, Russell King <linux+etnaviv@...linux.org.uk>, 
	David Airlie <airlied@...il.com>, Daniel Vetter <daniel@...ll.ch>, etnaviv@...ts.freedesktop.org, 
	dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 1/3] drm/etnaviv: Update hardware headers from rnndb

>
> Update the state HI header from the rnndb commit
> 8d7ee714cfe2 ("Merge pull request #24 from pH5/unknown-3950").
>
> Signed-off-by: Philipp Zabel <p.zabel@...gutronix.de>

You missed my R-b from the v1 series for this patch - please include
it the next time!

Reviewed-by: Christian Gmeiner <cgmeiner@...lia.com>

> ---
>  drivers/gpu/drm/etnaviv/cmdstream.xml.h |  52 ++++++++++++++--
>  drivers/gpu/drm/etnaviv/common.xml.h    |  12 ++--
>  drivers/gpu/drm/etnaviv/state.xml.h     | 101 +++++++++++++++++++++++++++-----
>  drivers/gpu/drm/etnaviv/state_blt.xml.h |  20 +++----
>  drivers/gpu/drm/etnaviv/state_hi.xml.h  |  28 +++++----
>  5 files changed, 170 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/cmdstream.xml.h b/drivers/gpu/drm/etnaviv/cmdstream.xml.h
> index 65f1ba1099bd..a96597a27ae2 100644
> --- a/drivers/gpu/drm/etnaviv/cmdstream.xml.h
> +++ b/drivers/gpu/drm/etnaviv/cmdstream.xml.h
> @@ -8,11 +8,11 @@ This file was generated by the rules-ng-ng headergen tool in this git repository
>  git clone git://0x04.net/rules-ng-ng
>
>  The rules-ng-ng source files this header was generated from are:
> -- cmdstream.xml (  14094 bytes, from 2016-11-11 06:55:14)
> -- copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
> -- common.xml    (  23344 bytes, from 2016-11-10 15:14:07)
> +- cmdstream.xml (  16933 bytes, from 2023-12-11 15:50:17)
> +- copyright.xml (   1597 bytes, from 2016-11-10 13:58:32)
> +- common.xml    (  35664 bytes, from 2023-12-06 10:55:32)
>
> -Copyright (C) 2012-2016 by the following authors:
> +Copyright (C) 2012-2023 by the following authors:
>  - Wladimir J. van der Laan <laanwj@...il.com>
>  - Christian Gmeiner <christian.gmeiner@...il.com>
>  - Lucas Stach <l.stach@...gutronix.de>
> @@ -52,6 +52,9 @@ DEALINGS IN THE SOFTWARE.
>  #define FE_OPCODE_RETURN                                       0x0000000b
>  #define FE_OPCODE_DRAW_INSTANCED                               0x0000000c
>  #define FE_OPCODE_CHIP_SELECT                                  0x0000000d
> +#define FE_OPCODE_WAIT_FENCE                                   0x0000000f
> +#define FE_OPCODE_DRAW_INDIRECT                                        0x00000010
> +#define FE_OPCODE_SNAP_PAGES                                   0x00000013
>  #define PRIMITIVE_TYPE_POINTS                                  0x00000001
>  #define PRIMITIVE_TYPE_LINES                                   0x00000002
>  #define PRIMITIVE_TYPE_LINE_STRIP                              0x00000003
> @@ -192,6 +195,9 @@ DEALINGS IN THE SOFTWARE.
>  #define VIV_FE_STALL_TOKEN_TO__MASK                            0x00001f00
>  #define VIV_FE_STALL_TOKEN_TO__SHIFT                           8
>  #define VIV_FE_STALL_TOKEN_TO(x)                               (((x) << VIV_FE_STALL_TOKEN_TO__SHIFT) & VIV_FE_STALL_TOKEN_TO__MASK)
> +#define VIV_FE_STALL_TOKEN_UNK28__MASK                         0x30000000
> +#define VIV_FE_STALL_TOKEN_UNK28__SHIFT                                28
> +#define VIV_FE_STALL_TOKEN_UNK28(x)                            (((x) << VIV_FE_STALL_TOKEN_UNK28__SHIFT) & VIV_FE_STALL_TOKEN_UNK28__MASK)
>
>  #define VIV_FE_CALL                                            0x00000000
>
> @@ -266,5 +272,43 @@ DEALINGS IN THE SOFTWARE.
>  #define VIV_FE_DRAW_INSTANCED_START_INDEX__SHIFT               0
>  #define VIV_FE_DRAW_INSTANCED_START_INDEX(x)                   (((x) << VIV_FE_DRAW_INSTANCED_START_INDEX__SHIFT) & VIV_FE_DRAW_INSTANCED_START_INDEX__MASK)
>
> +#define VIV_FE_WAIT_FENCE                                      0x00000000
> +
> +#define VIV_FE_WAIT_FENCE_HEADER                               0x00000000
> +#define VIV_FE_WAIT_FENCE_HEADER_OP__MASK                      0xf8000000
> +#define VIV_FE_WAIT_FENCE_HEADER_OP__SHIFT                     27
> +#define VIV_FE_WAIT_FENCE_HEADER_OP_WAIT_FENCE                 0x78000000
> +#define VIV_FE_WAIT_FENCE_HEADER_UNK16__MASK                   0x00030000
> +#define VIV_FE_WAIT_FENCE_HEADER_UNK16__SHIFT                  16
> +#define VIV_FE_WAIT_FENCE_HEADER_UNK16(x)                      (((x) << VIV_FE_WAIT_FENCE_HEADER_UNK16__SHIFT) & VIV_FE_WAIT_FENCE_HEADER_UNK16__MASK)
> +#define VIV_FE_WAIT_FENCE_HEADER_WAITCOUNT__MASK               0x0000ffff
> +#define VIV_FE_WAIT_FENCE_HEADER_WAITCOUNT__SHIFT              0
> +#define VIV_FE_WAIT_FENCE_HEADER_WAITCOUNT(x)                  (((x) << VIV_FE_WAIT_FENCE_HEADER_WAITCOUNT__SHIFT) & VIV_FE_WAIT_FENCE_HEADER_WAITCOUNT__MASK)
> +
> +#define VIV_FE_WAIT_FENCE_ADDRESS                              0x00000004
> +
> +#define VIV_FE_DRAW_INDIRECT                                   0x00000000
> +
> +#define VIV_FE_DRAW_INDIRECT_HEADER                            0x00000000
> +#define VIV_FE_DRAW_INDIRECT_HEADER_OP__MASK                   0xf8000000
> +#define VIV_FE_DRAW_INDIRECT_HEADER_OP__SHIFT                  27
> +#define VIV_FE_DRAW_INDIRECT_HEADER_OP_DRAW_INDIRECT           0x80000000
> +#define VIV_FE_DRAW_INDIRECT_HEADER_INDEXED                    0x00000100
> +#define VIV_FE_DRAW_INDIRECT_HEADER_TYPE__MASK                 0x0000000f
> +#define VIV_FE_DRAW_INDIRECT_HEADER_TYPE__SHIFT                        0
> +#define VIV_FE_DRAW_INDIRECT_HEADER_TYPE(x)                    (((x) << VIV_FE_DRAW_INDIRECT_HEADER_TYPE__SHIFT) & VIV_FE_DRAW_INDIRECT_HEADER_TYPE__MASK)
> +
> +#define VIV_FE_DRAW_INDIRECT_ADDRESS                           0x00000004
> +
> +#define VIV_FE_SNAP_PAGES                                      0x00000000
> +
> +#define VIV_FE_SNAP_PAGES_HEADER                               0x00000000
> +#define VIV_FE_SNAP_PAGES_HEADER_OP__MASK                      0xf8000000
> +#define VIV_FE_SNAP_PAGES_HEADER_OP__SHIFT                     27
> +#define VIV_FE_SNAP_PAGES_HEADER_OP_SNAP_PAGES                 0x98000000
> +#define VIV_FE_SNAP_PAGES_HEADER_UNK0__MASK                    0x0000001f
> +#define VIV_FE_SNAP_PAGES_HEADER_UNK0__SHIFT                   0
> +#define VIV_FE_SNAP_PAGES_HEADER_UNK0(x)                       (((x) << VIV_FE_SNAP_PAGES_HEADER_UNK0__SHIFT) & VIV_FE_SNAP_PAGES_HEADER_UNK0__MASK)
> +
>
>  #endif /* CMDSTREAM_XML */
> diff --git a/drivers/gpu/drm/etnaviv/common.xml.h b/drivers/gpu/drm/etnaviv/common.xml.h
> index 001faea80fef..07c0bf47d89f 100644
> --- a/drivers/gpu/drm/etnaviv/common.xml.h
> +++ b/drivers/gpu/drm/etnaviv/common.xml.h
> @@ -8,12 +8,12 @@ This file was generated by the rules-ng-ng headergen tool in this git repository
>  git clone git://0x04.net/rules-ng-ng
>
>  The rules-ng-ng source files this header was generated from are:
> -- 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)
> +- texdesc_3d.xml (   3183 bytes, from 2022-11-18 09:38:25)
> +- copyright.xml  (   1597 bytes, from 2016-11-10 13:58:32)
> +- common.xml     (  35664 bytes, from 2023-12-06 10:55:32)
> +- common_3d.xml  (  15069 bytes, from 2023-11-22 10:05:24)
>
> -Copyright (C) 2012-2018 by the following authors:
> +Copyright (C) 2012-2023 by the following authors:
>  - Wladimir J. van der Laan <laanwj@...il.com>
>  - Christian Gmeiner <christian.gmeiner@...il.com>
>  - Lucas Stach <l.stach@...gutronix.de>
> @@ -65,6 +65,7 @@ DEALINGS IN THE SOFTWARE.
>  #define chipModel_GC520                                                0x00000520
>  #define chipModel_GC530                                                0x00000530
>  #define chipModel_GC600                                                0x00000600
> +#define chipModel_GC620                                                0x00000620
>  #define chipModel_GC700                                                0x00000700
>  #define chipModel_GC800                                                0x00000800
>  #define chipModel_GC860                                                0x00000860
> @@ -481,5 +482,6 @@ DEALINGS IN THE SOFTWARE.
>  #define chipMinorFeatures11_NN_INTERLEVE8                      0x00000008
>  #define chipMinorFeatures11_TP_REORDER                         0x00000010
>  #define chipMinorFeatures11_PE_DEPTH_ONLY_OQFIX                        0x00000020
> +#define chipMinorFeatures12_G2D_DEC400EX                       0x00000020
>
>  #endif /* COMMON_XML */
> diff --git a/drivers/gpu/drm/etnaviv/state.xml.h b/drivers/gpu/drm/etnaviv/state.xml.h
> index 421cb7cc0053..573e39489a27 100644
> --- a/drivers/gpu/drm/etnaviv/state.xml.h
> +++ b/drivers/gpu/drm/etnaviv/state.xml.h
> @@ -8,17 +8,17 @@ This file was generated by the rules-ng-ng headergen tool in this git repository
>  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)
> +- state.xml     (  29355 bytes, from 2024-01-19 10:18:54)
> +- common.xml    (  35664 bytes, from 2023-12-06 10:55:32)
> +- common_3d.xml (  15069 bytes, from 2023-11-22 10:05:24)
> +- state_hi.xml  (  35854 bytes, from 2023-12-11 15:50:17)
> +- copyright.xml (   1597 bytes, from 2016-11-10 13:58:32)
> +- state_2d.xml  (  52271 bytes, from 2023-06-02 12:35:03)
> +- state_3d.xml  (  89522 bytes, from 2024-01-19 10:18:54)
> +- state_blt.xml (  14592 bytes, from 2023-11-22 10:05:09)
> +- state_vg.xml  (   5975 bytes, from 2016-11-10 13:58:32)
>
> -Copyright (C) 2012-2017 by the following authors:
> +Copyright (C) 2012-2024 by the following authors:
>  - Wladimir J. van der Laan <laanwj@...il.com>
>  - Christian Gmeiner <christian.gmeiner@...il.com>
>  - Lucas Stach <l.stach@...gutronix.de>
> @@ -55,6 +55,8 @@ DEALINGS IN THE SOFTWARE.
>  #define FE_DATA_TYPE_UNSIGNED_SHORT                            0x00000003
>  #define FE_DATA_TYPE_INT                                       0x00000004
>  #define FE_DATA_TYPE_UNSIGNED_INT                              0x00000005
> +#define FE_DATA_TYPE_INT_2_10_10_10_REV                                0x00000006
> +#define FE_DATA_TYPE_UNSIGNED_INT_2_10_10_10_REV               0x00000007
>  #define FE_DATA_TYPE_FLOAT                                     0x00000008
>  #define FE_DATA_TYPE_HALF_FLOAT                                        0x00000009
>  #define FE_DATA_TYPE_FIXED                                     0x0000000b
> @@ -89,6 +91,7 @@ DEALINGS IN THE SOFTWARE.
>  #define VIVS_FE_VERTEX_ELEMENT_CONFIG_NORMALIZE__MASK          0x0000c000
>  #define VIVS_FE_VERTEX_ELEMENT_CONFIG_NORMALIZE__SHIFT         14
>  #define VIVS_FE_VERTEX_ELEMENT_CONFIG_NORMALIZE_OFF            0x00000000
> +#define VIVS_FE_VERTEX_ELEMENT_CONFIG_NORMALIZE_SIGN_EXTEND    0x00004000
>  #define VIVS_FE_VERTEX_ELEMENT_CONFIG_NORMALIZE_ON             0x00008000
>  #define VIVS_FE_VERTEX_ELEMENT_CONFIG_START__MASK              0x00ff0000
>  #define VIVS_FE_VERTEX_ELEMENT_CONFIG_START__SHIFT             16
> @@ -209,7 +212,15 @@ DEALINGS IN THE SOFTWARE.
>
>  #define VIVS_FE_GENERIC_ATTRIB_SCALE(i0)                      (0x00000780 + 0x4*(i0))
>
> -#define VIVS_FE_HALTI5_UNK007C4                                        0x000007c4
> +#define VIVS_FE_HALTI5_ID_CONFIG                               0x000007c4
> +#define VIVS_FE_HALTI5_ID_CONFIG_VERTEX_ID_ENABLE              0x00000001
> +#define VIVS_FE_HALTI5_ID_CONFIG_INSTANCE_ID_ENABLE            0x00000002
> +#define VIVS_FE_HALTI5_ID_CONFIG_VERTEX_ID_REG__MASK           0x0000ff00
> +#define VIVS_FE_HALTI5_ID_CONFIG_VERTEX_ID_REG__SHIFT          8
> +#define VIVS_FE_HALTI5_ID_CONFIG_VERTEX_ID_REG(x)              (((x) << VIVS_FE_HALTI5_ID_CONFIG_VERTEX_ID_REG__SHIFT) & VIVS_FE_HALTI5_ID_CONFIG_VERTEX_ID_REG__MASK)
> +#define VIVS_FE_HALTI5_ID_CONFIG_INSTANCE_ID_REG__MASK         0x00ff0000
> +#define VIVS_FE_HALTI5_ID_CONFIG_INSTANCE_ID_REG__SHIFT                16
> +#define VIVS_FE_HALTI5_ID_CONFIG_INSTANCE_ID_REG(x)            (((x) << VIVS_FE_HALTI5_ID_CONFIG_INSTANCE_ID_REG__SHIFT) & VIVS_FE_HALTI5_ID_CONFIG_INSTANCE_ID_REG__MASK)
>
>  #define VIVS_FE_HALTI5_UNK007D0(i0)                           (0x000007d0 + 0x4*(i0))
>  #define VIVS_FE_HALTI5_UNK007D0__ESIZE                         0x00000004
> @@ -232,6 +243,8 @@ DEALINGS IN THE SOFTWARE.
>
>  #define VIVS_FE_ROBUSTNESS_UNK007F8                            0x000007f8
>
> +#define VIVS_FE_MULTI_CLUSTER_UNK007FC                         0x000007fc
> +
>  #define VIVS_GL                                                        0x00000000
>
>  #define VIVS_GL_PIPE_SELECT                                    0x00003800
> @@ -273,6 +286,7 @@ DEALINGS IN THE SOFTWARE.
>  #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_CACHE_UNK14                              0x00004000
>
>  #define VIVS_GL_FLUSH_MMU                                      0x00003810
>  #define VIVS_GL_FLUSH_MMU_FLUSH_FEMMU                          0x00000001
> @@ -282,6 +296,8 @@ DEALINGS IN THE SOFTWARE.
>  #define VIVS_GL_FLUSH_MMU_FLUSH_UNK4                           0x00000010
>
>  #define VIVS_GL_VERTEX_ELEMENT_CONFIG                          0x00003814
> +#define VIVS_GL_VERTEX_ELEMENT_CONFIG_UNK0                     0x00000001
> +#define VIVS_GL_VERTEX_ELEMENT_CONFIG_REUSE                    0x00000010
>
>  #define VIVS_GL_MULTI_SAMPLE_CONFIG                            0x00003818
>  #define VIVS_GL_MULTI_SAMPLE_CONFIG_MSAA_SAMPLES__MASK         0x00000003
> @@ -368,7 +384,7 @@ DEALINGS IN THE SOFTWARE.
>
>  #define VIVS_GL_OCCLUSION_QUERY_CONTROL                                0x00003830
>
> -#define VIVS_GL_UNK03834                                       0x00003834
> +#define VIVS_GL_VARYING_NUM_COMPONENTS2                                0x00003834
>
>  #define VIVS_GL_UNK03838                                       0x00003838
>
> @@ -387,7 +403,16 @@ DEALINGS IN THE SOFTWARE.
>
>  #define VIVS_GL_FENCE_OUT_DATA_LOW                             0x0000386c
>
> -#define VIVS_GL_HALTI5_UNK03884                                        0x00003884
> +#define VIVS_GL_USC_CONTROL                                    0x00003884
> +#define VIVS_GL_USC_CONTROL_L1_CACHE_RATIO__MASK               0x00000007
> +#define VIVS_GL_USC_CONTROL_L1_CACHE_RATIO__SHIFT              0
> +#define VIVS_GL_USC_CONTROL_L1_CACHE_RATIO(x)                  (((x) << VIVS_GL_USC_CONTROL_L1_CACHE_RATIO__SHIFT) & VIVS_GL_USC_CONTROL_L1_CACHE_RATIO__MASK)
> +#define VIVS_GL_USC_CONTROL_ATTRIB_CACHE_RATIO__MASK           0x00000f00
> +#define VIVS_GL_USC_CONTROL_ATTRIB_CACHE_RATIO__SHIFT          8
> +#define VIVS_GL_USC_CONTROL_ATTRIB_CACHE_RATIO(x)              (((x) << VIVS_GL_USC_CONTROL_ATTRIB_CACHE_RATIO__SHIFT) & VIVS_GL_USC_CONTROL_ATTRIB_CACHE_RATIO__MASK)
> +#define VIVS_GL_USC_CONTROL_UNK16__MASK                                0x001f0000
> +#define VIVS_GL_USC_CONTROL_UNK16__SHIFT                       16
> +#define VIVS_GL_USC_CONTROL_UNK16(x)                           (((x) << VIVS_GL_USC_CONTROL_UNK16__SHIFT) & VIVS_GL_USC_CONTROL_UNK16__MASK)
>
>  #define VIVS_GL_HALTI5_SH_SPECIALS                             0x00003888
>  #define VIVS_GL_HALTI5_SH_SPECIALS_VS_PSIZE_OUT__MASK          0x0000007f
> @@ -421,7 +446,48 @@ DEALINGS IN THE SOFTWARE.
>
>  #define VIVS_GL_SECURITY_UNK3904                               0x00003904
>
> +#define VIVS_GL_MULTI_CLUSTER_UNK3908                          0x00003908
> +#define VIVS_GL_MULTI_CLUSTER_UNK3908_UNK0__MASK               0x00000007
> +#define VIVS_GL_MULTI_CLUSTER_UNK3908_UNK0__SHIFT              0
> +#define VIVS_GL_MULTI_CLUSTER_UNK3908_UNK0(x)                  (((x) << VIVS_GL_MULTI_CLUSTER_UNK3908_UNK0__SHIFT) & VIVS_GL_MULTI_CLUSTER_UNK3908_UNK0__MASK)
> +
> +#define VIVS_GL_MULTI_CLUSTER_UNK3910(i0)                     (0x00003910 + 0x4*(i0))
> +#define VIVS_GL_MULTI_CLUSTER_UNK3910__ESIZE                   0x00000004
> +#define VIVS_GL_MULTI_CLUSTER_UNK3910__LEN                     0x00000004
> +#define VIVS_GL_MULTI_CLUSTER_UNK3910_CLUSTER_ALIVE_MASK__MASK 0x000000ff
> +#define VIVS_GL_MULTI_CLUSTER_UNK3910_CLUSTER_ALIVE_MASK__SHIFT        0
> +#define VIVS_GL_MULTI_CLUSTER_UNK3910_CLUSTER_ALIVE_MASK(x)    (((x) << VIVS_GL_MULTI_CLUSTER_UNK3910_CLUSTER_ALIVE_MASK__SHIFT) & VIVS_GL_MULTI_CLUSTER_UNK3910_CLUSTER_ALIVE_MASK__MASK)
> +
> +#define VIVS_GL_NN_CONFIG                                      0x00003930
> +#define VIVS_GL_NN_CONFIG_UNK0__MASK                           0x00000003
> +#define VIVS_GL_NN_CONFIG_UNK0__SHIFT                          0
> +#define VIVS_GL_NN_CONFIG_UNK0(x)                              (((x) << VIVS_GL_NN_CONFIG_UNK0__SHIFT) & VIVS_GL_NN_CONFIG_UNK0__MASK)
> +#define VIVS_GL_NN_CONFIG_DISABLE_ZDPN                         0x00000004
> +#define VIVS_GL_NN_CONFIG_DISABLE_SWTILING                     0x00000008
> +#define VIVS_GL_NN_CONFIG_SMALL_BATCH                          0x00000010
> +#define VIVS_GL_NN_CONFIG_DDR_BURST_SIZE__MASK                 0x00000060
> +#define VIVS_GL_NN_CONFIG_DDR_BURST_SIZE__SHIFT                        5
> +#define VIVS_GL_NN_CONFIG_DDR_BURST_SIZE(x)                    (((x) << VIVS_GL_NN_CONFIG_DDR_BURST_SIZE__SHIFT) & VIVS_GL_NN_CONFIG_DDR_BURST_SIZE__MASK)
> +#define VIVS_GL_NN_CONFIG_UNK7                                 0x00000080
> +#define VIVS_GL_NN_CONFIG_NN_CORE_COUNT__MASK                  0x00000f00
> +#define VIVS_GL_NN_CONFIG_NN_CORE_COUNT__SHIFT                 8
> +#define VIVS_GL_NN_CONFIG_NN_CORE_COUNT(x)                     (((x) << VIVS_GL_NN_CONFIG_NN_CORE_COUNT__SHIFT) & VIVS_GL_NN_CONFIG_NN_CORE_COUNT__MASK)
> +#define VIVS_GL_NN_CONFIG_UNK12                                        0x00001000
> +
> +#define VIVS_GL_SRAM_REMAP_ADDRESS                             0x00003938
> +
> +#define VIVS_GL_OCB_REMAP_START                                        0x0000393c
> +
> +#define VIVS_GL_OCB_REMAP_END                                  0x00003940
> +
> +#define VIVS_GL_TP_CONFIG                                      0x0000394c
> +
> +#define VIVS_GL_UNK03950                                       0x00003950
> +
>  #define VIVS_GL_UNK03A00                                       0x00003a00
> +#define VIVS_GL_UNK03A00_UNK0__MASK                            0x00000007
> +#define VIVS_GL_UNK03A00_UNK0__SHIFT                           0
> +#define VIVS_GL_UNK03A00_UNK0(x)                               (((x) << VIVS_GL_UNK03A00_UNK0__SHIFT) & VIVS_GL_UNK03A00_UNK0__MASK)
>
>  #define VIVS_GL_UNK03A04                                       0x00003a04
>
> @@ -451,7 +517,7 @@ DEALINGS IN THE SOFTWARE.
>
>  #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_VERTEX_DIVISOR(i0)            (0x00014680 + 0x4*(i0))
>
>  #define VIVS_NFE_VERTEX_STREAMS_ROBUSTNESS_UNK146C0(i0)               (0x000146c0 + 0x4*(i0))
>
> @@ -498,5 +564,12 @@ DEALINGS IN THE SOFTWARE.
>
>  #define VIVS_DUMMY_DUMMY                                       0x0003fffc
>
> +#define VIVS_WD                                                        0x00000000
> +
> +#define VIVS_WD_UNK18404                                       0x00018404
> +#define VIVS_WD_UNK18404_UNK0__MASK                            0x00000003
> +#define VIVS_WD_UNK18404_UNK0__SHIFT                           0
> +#define VIVS_WD_UNK18404_UNK0(x)                               (((x) << VIVS_WD_UNK18404_UNK0__SHIFT) & VIVS_WD_UNK18404_UNK0__MASK)
> +
>
>  #endif /* STATE_XML */
> diff --git a/drivers/gpu/drm/etnaviv/state_blt.xml.h b/drivers/gpu/drm/etnaviv/state_blt.xml.h
> index 0e8bcf9dcc93..380d3533d645 100644
> --- a/drivers/gpu/drm/etnaviv/state_blt.xml.h
> +++ b/drivers/gpu/drm/etnaviv/state_blt.xml.h
> @@ -8,17 +8,17 @@ This file was generated by the rules-ng-ng headergen tool in this git repository
>  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)
> +- state.xml     (  29355 bytes, from 2024-01-19 10:18:54)
> +- common.xml    (  35664 bytes, from 2023-12-06 10:55:32)
> +- common_3d.xml (  15069 bytes, from 2023-11-22 10:05:24)
> +- state_hi.xml  (  35854 bytes, from 2023-12-11 15:50:17)
> +- copyright.xml (   1597 bytes, from 2016-11-10 13:58:32)
> +- state_2d.xml  (  52271 bytes, from 2023-06-02 12:35:03)
> +- state_3d.xml  (  89522 bytes, from 2024-01-19 10:18:54)
> +- state_blt.xml (  14592 bytes, from 2023-11-22 10:05:09)
> +- state_vg.xml  (   5975 bytes, from 2016-11-10 13:58:32)
>
> -Copyright (C) 2012-2017 by the following authors:
> +Copyright (C) 2012-2023 by the following authors:
>  - Wladimir J. van der Laan <laanwj@...il.com>
>  - Christian Gmeiner <christian.gmeiner@...il.com>
>  - Lucas Stach <l.stach@...gutronix.de>
> diff --git a/drivers/gpu/drm/etnaviv/state_hi.xml.h b/drivers/gpu/drm/etnaviv/state_hi.xml.h
> index 94d5f33b1fd6..829bc528e618 100644
> --- a/drivers/gpu/drm/etnaviv/state_hi.xml.h
> +++ b/drivers/gpu/drm/etnaviv/state_hi.xml.h
> @@ -8,17 +8,17 @@ This file was generated by the rules-ng-ng headergen tool in this git repository
>  git clone git://0x04.net/rules-ng-ng
>
>  The rules-ng-ng source files this header was generated from are:
> -- state.xml     (  27198 bytes, from 2022-04-22 10:35:24)
> -- 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  (  34804 bytes, from 2022-12-02 09:06:28)
> -- 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  (  84445 bytes, from 2022-11-15 15:59:38)
> -- state_blt.xml (  14424 bytes, from 2022-11-07 11:18:41)
> -- state_vg.xml  (   5975 bytes, from 2020-10-28 12:56:03)
> +- state.xml     (  29355 bytes, from 2024-01-19 10:18:54)
> +- common.xml    (  35664 bytes, from 2023-12-06 10:55:32)
> +- common_3d.xml (  15069 bytes, from 2023-11-22 10:05:24)
> +- state_hi.xml  (  35854 bytes, from 2023-12-11 15:50:17)
> +- copyright.xml (   1597 bytes, from 2016-11-10 13:58:32)
> +- state_2d.xml  (  52271 bytes, from 2023-06-02 12:35:03)
> +- state_3d.xml  (  89522 bytes, from 2024-01-19 10:18:54)
> +- state_blt.xml (  14592 bytes, from 2023-11-22 10:05:09)
> +- state_vg.xml  (   5975 bytes, from 2016-11-10 13:58:32)
>
> -Copyright (C) 2012-2022 by the following authors:
> +Copyright (C) 2012-2023 by the following authors:
>  - Wladimir J. van der Laan <laanwj@...il.com>
>  - Christian Gmeiner <christian.gmeiner@...il.com>
>  - Lucas Stach <l.stach@...gutronix.de>
> @@ -275,8 +275,10 @@ DEALINGS IN THE SOFTWARE.
>  #define VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_SE 0x00000020
>  #define VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_RA 0x00000040
>  #define VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_TX 0x00000080
> +#define VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_SH_EU      0x00000400
>  #define VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_RA_EZ      0x00010000
>  #define VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_RA_HZ      0x00020000
> +#define VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_NN 0x00400000
>
>  #define VIVS_PM_MODULE_STATUS                                  0x00000108
>  #define VIVS_PM_MODULE_STATUS_MODULE_CLOCK_GATED_FE            0x00000001
> @@ -620,5 +622,11 @@ DEALINGS IN THE SOFTWARE.
>
>  #define VIVS_MC_MC_AXI_SAMPLE_COUNT                            0x00000574
>
> +#define VIVS_DEC400EX                                          0x00000000
> +
> +#define VIVS_DEC400EX_UNK00800                                 0x00000800
> +
> +#define VIVS_DEC400EX_UNK00808                                 0x00000808
> +
>
>  #endif /* STATE_HI_XML */
>
> --
> 2.39.2
>


-- 
greets
--
Christian Gmeiner, MSc

https://christian-gmeiner.info/privacypolicy

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ