Mesa (main): freedreno/a4xx: include guesses from a3xx for some of the constid's

[GitLab Mirror]

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

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat Nov 13 04:24:43 2021 -0500

freedreno/a4xx: include guesses from a3xx for some of the constid's

The ones that are untested are left as comments. The ones that rename
values were tested manually.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13806>

---

 src/freedreno/computerator/a4xx.c       | 4 ++--
 src/freedreno/registers/adreno/a4xx.xml | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/freedreno/computerator/a4xx.c b/src/freedreno/computerator/a4xx.c
index 0dbb307127c..2fc7e3cceb7 100644
--- a/src/freedreno/computerator/a4xx.c
+++ b/src/freedreno/computerator/a4xx.c
@@ -135,10 +135,10 @@ cs_program_emit(struct fd_ringbuffer *ring, struct kernel *kernel)
 
    OUT_PKT0(ring, REG_A4XX_HLSQ_CL_CONTROL_0, 2);
    OUT_RING(ring, A4XX_HLSQ_CL_CONTROL_0_WGIDCONSTID(work_group_id) |
-                     A4XX_HLSQ_CL_CONTROL_0_UNK12CONSTID(regid(63, 0)) |
+                     A4XX_HLSQ_CL_CONTROL_0_KERNELDIMCONSTID(regid(63, 0)) |
                      A4XX_HLSQ_CL_CONTROL_0_LOCALIDREGID(local_invocation_id));
    OUT_RING(ring, A4XX_HLSQ_CL_CONTROL_1_UNK0CONSTID(regid(63, 0)) |
-                     A4XX_HLSQ_CL_CONTROL_1_UNK12CONSTID(regid(63, 0)));
+                     A4XX_HLSQ_CL_CONTROL_1_WORKGROUPSIZECONSTID(regid(63, 0)));
 
    OUT_PKT0(ring, REG_A4XX_HLSQ_CL_KERNEL_CONST, 1);
    OUT_RING(ring, A4XX_HLSQ_CL_KERNEL_CONST_UNK0CONSTID(regid(63, 0)) |
diff --git a/src/freedreno/registers/adreno/a4xx.xml b/src/freedreno/registers/adreno/a4xx.xml
index 498e86614d2..19e0b0c9480 100644
--- a/src/freedreno/registers/adreno/a4xx.xml
+++ b/src/freedreno/registers/adreno/a4xx.xml
@@ -2100,14 +2100,16 @@ perhaps they should be taken with a grain of salt
 	<reg32 offset="0x23d3" name="HLSQ_CL_NDRANGE_6"/>
 	<reg32 offset="0x23d4" name="HLSQ_CL_CONTROL_0">
 		<bitfield name="WGIDCONSTID" low="0" high="11" type="a3xx_regid"/>
-		<bitfield name="UNK12CONSTID" low="12" high="23" type="a3xx_regid"/>
+		<bitfield name="KERNELDIMCONSTID" low="12" high="23" type="a3xx_regid"/>
 		<bitfield name="LOCALIDREGID" low="24" high="31" type="a3xx_regid"/>
 	</reg32>
 	<reg32 offset="0x23d5" name="HLSQ_CL_CONTROL_1">
+		<!-- GLOBALSIZECONSTID? "kernel size" -->
 		<bitfield name="UNK0CONSTID" low="0" high="11" type="a3xx_regid"/>
-		<bitfield name="UNK12CONSTID" low="12" high="23" type="a3xx_regid"/>
+		<bitfield name="WORKGROUPSIZECONSTID" low="12" high="23" type="a3xx_regid"/>
 	</reg32>
 	<reg32 offset="0x23d6" name="HLSQ_CL_KERNEL_CONST">
+		<!-- GLOBALOFFSETCONSTID -->
 		<bitfield name="UNK0CONSTID" low="0" high="11" type="a3xx_regid"/>
 		<bitfield name="NUMWGCONSTID" low="12" high="23" type="a3xx_regid"/>
 	</reg32>
@@ -2115,6 +2117,7 @@ perhaps they should be taken with a grain of salt
 	<reg32 offset="0x23d8" name="HLSQ_CL_KERNEL_GROUP_Y"/>
 	<reg32 offset="0x23d9" name="HLSQ_CL_KERNEL_GROUP_Z"/>
 	<reg32 offset="0x23da" name="HLSQ_CL_WG_OFFSET">
+		<!-- WGOFFSETCONSTID -->
 		<bitfield name="UNK0CONSTID" low="0" high="11" type="a3xx_regid"/>
 	</reg32>
 	<reg32 offset="0x23db" name="HLSQ_UPDATE_CONTROL"/>