From: Christian Gmeiner Date: Tue, 24 Oct 2023 13:30:26 +0000 (+0200) Subject: etnaviv: Update headers from rnndb X-Git-Tag: upstream/23.3.3~96 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81cb966a87fe9852dcba7f2491088ccf9fc1a25a;p=platform%2Fupstream%2Fmesa.git etnaviv: Update headers from rnndb Update to rnndb commit 071f5a60dcb8. This updates VIVS_PA_SHADER_ATTRIBUTES__LEN define from 10 to 16 and fixes memory corruption if more then 10 varyings are used. The current upper limit for varyings is 16. Cc: mesa-stable Signed-off-by: Christian Gmeiner Reviewed-by: Lucas Stach Part-of: (cherry picked from commit 11ffb20b7072b4096dc4e033395f36ff6fbfd42e) --- diff --git a/.pick_status.json b/.pick_status.json index 3fa1905..5e97297 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -274,7 +274,7 @@ "description": "etnaviv: Update headers from rnndb", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h b/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h index bfab938..cc8f351 100644 --- a/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h +++ b/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h @@ -10,7 +10,7 @@ git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: - cmdstream.xml ( 16930 bytes, from 2019-01-04 11:37:39) - copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) +- common.xml ( 35465 bytes, from 2023-11-13 11:29:31) Copyright (C) 2012-2019 by the following authors: - Wladimir J. van der Laan diff --git a/src/gallium/drivers/etnaviv/hw/common.xml.h b/src/gallium/drivers/etnaviv/hw/common.xml.h index f3a2143..0a01ac2 100644 --- a/src/gallium/drivers/etnaviv/hw/common.xml.h +++ b/src/gallium/drivers/etnaviv/hw/common.xml.h @@ -10,10 +10,10 @@ 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 2018-02-10 13:09:26) - copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) -- common_3d.xml ( 15058 bytes, from 2022-10-07 06:11:53) +- common.xml ( 35465 bytes, from 2023-11-13 11:29:31) +- common_3d.xml ( 15069 bytes, from 2023-11-13 11:29:31) -Copyright (C) 2012-2020 by the following authors: +Copyright (C) 2012-2023 by the following authors: - Wladimir J. van der Laan - Christian Gmeiner - Lucas Stach diff --git a/src/gallium/drivers/etnaviv/hw/common_3d.xml.h b/src/gallium/drivers/etnaviv/hw/common_3d.xml.h index 3929196..60474a2 100644 --- a/src/gallium/drivers/etnaviv/hw/common_3d.xml.h +++ b/src/gallium/drivers/etnaviv/hw/common_3d.xml.h @@ -10,10 +10,10 @@ 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 2018-02-10 13:09:26) - copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) -- common_3d.xml ( 15058 bytes, from 2022-10-07 06:11:53) +- common.xml ( 35465 bytes, from 2023-11-13 11:29:31) +- common_3d.xml ( 15069 bytes, from 2023-11-13 11:29:31) -Copyright (C) 2012-2022 by the following authors: +Copyright (C) 2012-2023 by the following authors: - Wladimir J. van der Laan - Christian Gmeiner - Lucas Stach diff --git a/src/gallium/drivers/etnaviv/hw/isa.xml.h b/src/gallium/drivers/etnaviv/hw/isa.xml.h index c7134cf..5270cfc 100644 --- a/src/gallium/drivers/etnaviv/hw/isa.xml.h +++ b/src/gallium/drivers/etnaviv/hw/isa.xml.h @@ -8,10 +8,10 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- isa.xml ( 38205 bytes, from 2022-09-03 22:41:40) +- isa.xml ( 39261 bytes, from 2023-11-13 11:29:31) - copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -Copyright (C) 2012-2022 by the following authors: +Copyright (C) 2012-2023 by the following authors: - Wladimir J. van der Laan - Christian Gmeiner - Lucas Stach @@ -90,8 +90,8 @@ DEALINGS IN THE SOFTWARE. #define INST_OPCODE_CMP 0x00000031 #define INST_OPCODE_LOAD 0x00000032 #define INST_OPCODE_STORE 0x00000033 -#define INST_OPCODE_COPYSIGN 0x00000034 -#define INST_OPCODE_GETEXP 0x00000035 +#define INST_OPCODE_IMG_LOAD_3D 0x00000034 +#define INST_OPCODE_IMG_STORE_3D 0x00000035 #define INST_OPCODE_GETMANT 0x00000036 #define INST_OPCODE_NAN 0x00000037 #define INST_OPCODE_NEXTAFTER 0x00000038 @@ -159,8 +159,8 @@ DEALINGS IN THE SOFTWARE. #define INST_OPCODE_NORM_DP4 0x00000076 #define INST_OPCODE_NORM_MUL 0x00000077 #define INST_OPCODE_STORE_ATTR 0x00000078 -#define INST_OPCODE_LOAD_ATTR 0x00000079 -#define INST_OPCODE_EMIT 0x0000007a +#define INST_OPCODE_IMG_LOAD 0x00000079 +#define INST_OPCODE_IMG_STORE 0x0000007a #define INST_OPCODE_RESTART 0x0000007b #define INST_OPCODE_NOP7C 0x0000007c #define INST_OPCODE_NOP7D 0x0000007d diff --git a/src/gallium/drivers/etnaviv/hw/state.xml.h b/src/gallium/drivers/etnaviv/hw/state.xml.h index 22dd83e..c8f710e 100644 --- a/src/gallium/drivers/etnaviv/hw/state.xml.h +++ b/src/gallium/drivers/etnaviv/hw/state.xml.h @@ -8,17 +8,17 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- state.xml ( 27198 bytes, from 2022-08-16 16:28:18) -- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) -- common_3d.xml ( 15058 bytes, from 2022-10-07 06:11:53) -- state_hi.xml ( 34803 bytes, from 2022-08-16 16:28:18) +- state.xml ( 28218 bytes, from 2023-11-13 11:29:31) +- common.xml ( 35465 bytes, from 2023-11-13 11:29:31) +- common_3d.xml ( 15069 bytes, from 2023-11-13 11:29:31) +- state_hi.xml ( 34935 bytes, from 2023-11-13 11:29:31) - copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -- state_2d.xml ( 51552 bytes, from 2018-02-10 13:09:26) -- state_3d.xml ( 84326 bytes, from 2022-10-07 06:11:53) -- state_blt.xml ( 14424 bytes, from 2022-10-07 06:11:53) +- state_2d.xml ( 52271 bytes, from 2023-09-13 13:37:23) +- state_3d.xml ( 86123 bytes, from 2023-11-13 12:42:26) +- state_blt.xml ( 14424 bytes, from 2023-09-13 13:37:23) - state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) -Copyright (C) 2012-2022 by the following authors: +Copyright (C) 2012-2023 by the following authors: - Wladimir J. van der Laan - Christian Gmeiner - Lucas Stach @@ -400,7 +400,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 @@ -434,6 +443,30 @@ DEALINGS IN THE SOFTWARE. #define VIVS_GL_SECURITY_UNK3904 0x00003904 +#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_UNK03A00 0x00003a00 #define VIVS_GL_UNK03A04 0x00003a04 diff --git a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h index da764bb..2409c8c 100644 --- a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h +++ b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h @@ -8,17 +8,17 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- state.xml ( 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 ( 34803 bytes, from 2020-10-28 12:56:03) -- copyright.xml ( 1597 bytes, from 2020-10-28 12:56:03) -- state_2d.xml ( 51552 bytes, from 2020-10-28 12:56:03) -- state_3d.xml ( 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) - -Copyright (C) 2012-2022 by the following authors: +- state.xml ( 28218 bytes, from 2023-11-13 11:29:31) +- common.xml ( 35465 bytes, from 2023-11-13 11:29:31) +- common_3d.xml ( 15069 bytes, from 2023-11-13 11:29:31) +- state_hi.xml ( 34935 bytes, from 2023-11-13 11:29:31) +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) +- state_2d.xml ( 52271 bytes, from 2023-09-13 13:37:23) +- state_3d.xml ( 86123 bytes, from 2023-11-13 12:42:26) +- state_blt.xml ( 14424 bytes, from 2023-09-13 13:37:23) +- state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) + +Copyright (C) 2012-2023 by the following authors: - Wladimir J. van der Laan - Christian Gmeiner - Lucas Stach @@ -159,6 +159,15 @@ DEALINGS IN THE SOFTWARE. #define VIVS_VS_END_PC 0x00000800 #define VIVS_VS_OUTPUT_COUNT 0x00000804 +#define VIVS_VS_OUTPUT_COUNT_COUNT__MASK 0x000000ff +#define VIVS_VS_OUTPUT_COUNT_COUNT__SHIFT 0 +#define VIVS_VS_OUTPUT_COUNT_COUNT(x) (((x) << VIVS_VS_OUTPUT_COUNT_COUNT__SHIFT) & VIVS_VS_OUTPUT_COUNT_COUNT__MASK) +#define VIVS_VS_OUTPUT_COUNT_OUTPUT16_REG__MASK 0x0000ff00 +#define VIVS_VS_OUTPUT_COUNT_OUTPUT16_REG__SHIFT 8 +#define VIVS_VS_OUTPUT_COUNT_OUTPUT16_REG(x) (((x) << VIVS_VS_OUTPUT_COUNT_OUTPUT16_REG__SHIFT) & VIVS_VS_OUTPUT_COUNT_OUTPUT16_REG__MASK) +#define VIVS_VS_OUTPUT_COUNT_OUTPUT17_REG__MASK 0x00ff0000 +#define VIVS_VS_OUTPUT_COUNT_OUTPUT17_REG__SHIFT 16 +#define VIVS_VS_OUTPUT_COUNT_OUTPUT17_REG(x) (((x) << VIVS_VS_OUTPUT_COUNT_OUTPUT17_REG__SHIFT) & VIVS_VS_OUTPUT_COUNT_OUTPUT17_REG__MASK) #define VIVS_VS_INPUT_COUNT 0x00000808 #define VIVS_VS_INPUT_COUNT_COUNT__MASK 0x0000000f @@ -270,7 +279,7 @@ DEALINGS IN THE SOFTWARE. #define VIVS_VS_ICACHE_PREFETCH 0x0000088c -#define VIVS_VS_ICACHE_UNK00890 0x00000890 +#define VIVS_VS_ICACHE_PREFETCH_INSTRUCTIONS 0x00000890 #define VIVS_VS_HALTI5_UNK00898(i0) (0x00000898 + 0x4*(i0)) #define VIVS_VS_HALTI5_UNK00898__ESIZE 0x00000004 @@ -421,17 +430,23 @@ DEALINGS IN THE SOFTWARE. #define VIVS_CL_UNK00924 0x00000924 -#define VIVS_CL_UNK00940 0x00000940 +#define VIVS_CL_GLOBAL_WORK_OFFSET_X 0x0000092c -#define VIVS_CL_UNK00944 0x00000944 +#define VIVS_CL_GLOBAL_WORK_OFFSET_Y 0x00000934 -#define VIVS_CL_UNK00948 0x00000948 +#define VIVS_CL_GLOBAL_WORK_OFFSET_Z 0x0000093c -#define VIVS_CL_UNK0094C 0x0000094c +#define VIVS_CL_WORKGROUP_COUNT_X 0x00000940 -#define VIVS_CL_UNK00950 0x00000950 +#define VIVS_CL_WORKGROUP_COUNT_Y 0x00000944 -#define VIVS_CL_UNK00954 0x00000954 +#define VIVS_CL_WORKGROUP_COUNT_Z 0x00000948 + +#define VIVS_CL_WORKGROUP_SIZE_X 0x0000094c + +#define VIVS_CL_WORKGROUP_SIZE_Y 0x00000950 + +#define VIVS_CL_WORKGROUP_SIZE_Z 0x00000954 #define VIVS_CL_HALTI5_UNK00958 0x00000958 @@ -504,7 +519,7 @@ DEALINGS IN THE SOFTWARE. #define VIVS_PA_SHADER_ATTRIBUTES(i0) (0x00000a40 + 0x4*(i0)) #define VIVS_PA_SHADER_ATTRIBUTES__ESIZE 0x00000004 -#define VIVS_PA_SHADER_ATTRIBUTES__LEN 0x0000000a +#define VIVS_PA_SHADER_ATTRIBUTES__LEN 0x00000010 #define VIVS_PA_SHADER_ATTRIBUTES_BYPASS_FLAT 0x00000001 #define VIVS_PA_SHADER_ATTRIBUTES_UNK4__MASK 0x000000f0 #define VIVS_PA_SHADER_ATTRIBUTES_UNK4__SHIFT 4 @@ -593,7 +608,7 @@ DEALINGS IN THE SOFTWARE. #define VIVS_PS_OUTPUT_REG 0x00001004 #define VIVS_PS_INPUT_COUNT 0x00001008 -#define VIVS_PS_INPUT_COUNT_COUNT__MASK 0x0000000f +#define VIVS_PS_INPUT_COUNT_COUNT__MASK 0x0000001f #define VIVS_PS_INPUT_COUNT_COUNT__SHIFT 0 #define VIVS_PS_INPUT_COUNT_COUNT(x) (((x) << VIVS_PS_INPUT_COUNT_COUNT__SHIFT) & VIVS_PS_INPUT_COUNT_COUNT__MASK) #define VIVS_PS_INPUT_COUNT_UNK8__MASK 0x00001f00 @@ -628,6 +643,8 @@ DEALINGS IN THE SOFTWARE. #define VIVS_PS_RANGE_HIGH__SHIFT 16 #define VIVS_PS_RANGE_HIGH(x) (((x) << VIVS_PS_RANGE_HIGH__SHIFT) & VIVS_PS_RANGE_HIGH__MASK) +#define VIVS_PS_REG_COUNT 0x0000101e + #define VIVS_PS_UNIFORM_BASE 0x00001024 #define VIVS_PS_INST_ADDR 0x00001028 @@ -676,7 +693,7 @@ DEALINGS IN THE SOFTWARE. #define VIVS_PS_ICACHE_PREFETCH 0x00001048 -#define VIVS_PS_ICACHE_UNK0104C 0x0000104c +#define VIVS_PS_ICACHE_PREFETCH_INSTRUCTIONS 0x0000104c #define VIVS_PS_MSAA_CONFIG 0x00001054 @@ -694,6 +711,12 @@ DEALINGS IN THE SOFTWARE. #define VIVS_PS_HALTI5_UNK01098 0x00001098 +#define VIVS_PS_PSCS_THROTTLE 0x0000109c + +#define VIVS_PS_NN_INST_ADDR 0x000010a0 + +#define VIVS_PS_TP_INST_ADDR 0x000010b8 + #define VIVS_PS_INST_MEM(i0) (0x00006000 + 0x4*(i0)) #define VIVS_PS_INST_MEM__ESIZE 0x00000004 #define VIVS_PS_INST_MEM__LEN 0x00000400 diff --git a/src/gallium/drivers/etnaviv/hw/state_blt.xml.h b/src/gallium/drivers/etnaviv/hw/state_blt.xml.h index 1c7f78d..06c2ae3 100644 --- a/src/gallium/drivers/etnaviv/hw/state_blt.xml.h +++ b/src/gallium/drivers/etnaviv/hw/state_blt.xml.h @@ -8,17 +8,17 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- state.xml ( 27198 bytes, from 2022-08-16 16:28:18) -- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) -- common_3d.xml ( 15058 bytes, from 2022-10-07 06:11:53) -- state_hi.xml ( 34803 bytes, from 2022-08-16 16:28:18) +- state.xml ( 28218 bytes, from 2023-11-13 11:29:31) +- common.xml ( 35465 bytes, from 2023-11-13 11:29:31) +- common_3d.xml ( 15069 bytes, from 2023-11-13 11:29:31) +- state_hi.xml ( 34935 bytes, from 2023-11-13 11:29:31) - copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -- state_2d.xml ( 51552 bytes, from 2018-02-10 13:09:26) -- state_3d.xml ( 84326 bytes, from 2022-10-07 06:11:53) -- state_blt.xml ( 14424 bytes, from 2022-10-07 06:11:53) +- state_2d.xml ( 52271 bytes, from 2023-09-13 13:37:23) +- state_3d.xml ( 86123 bytes, from 2023-11-13 12:42:26) +- state_blt.xml ( 14424 bytes, from 2023-09-13 13:37:23) - state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) -Copyright (C) 2012-2022 by the following authors: +Copyright (C) 2012-2023 by the following authors: - Wladimir J. van der Laan - Christian Gmeiner - Lucas Stach diff --git a/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h b/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h index 8a0e7df..15af0af 100644 --- a/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h +++ b/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h @@ -10,8 +10,8 @@ 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 2018-02-10 13:09:26) - copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) -- common_3d.xml ( 15058 bytes, from 2022-10-07 06:11:53) +- common.xml ( 35465 bytes, from 2023-11-13 11:29:31) +- common_3d.xml ( 15069 bytes, from 2023-11-13 11:29:31) Copyright (C) 2012-2018 by the following authors: - Wladimir J. van der Laan