From 9f433a32cc75c0d45e8e683b08ff993ec965ea86 Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark@chromium.org>
Date: Wed, 31 Jul 2024 13:27:45 -0700
Subject: [PATCH] freedreno/computerator: Use CHIP variant reg builders

Avoid using the non-variant builders for regs that differ btwn
generations.  This will become deprecated.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30452>
---
 src/freedreno/computerator/a6xx.cc | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/freedreno/computerator/a6xx.cc b/src/freedreno/computerator/a6xx.cc
index 5bd13097183..3e09b48c281 100644
--- a/src/freedreno/computerator/a6xx.cc
+++ b/src/freedreno/computerator/a6xx.cc
@@ -208,11 +208,15 @@ cs_program_emit(struct fd_ringbuffer *ring, struct kernel *kernel)
                                    : (local_size[1] % 2 == 0) ? CS_YALIGN_2
                                                               : CS_YALIGN_1;
 
-      OUT_REG(ring, A7XX_HLSQ_CS_CNTL_1(.linearlocalidregid = regid(63, 0),
-                                        .threadsize = thrsz,
-                                        .unk11 = true,
-                                        .unk22 = true,
-                                        .yalign = yalign, ));
+      OUT_REG(ring,
+         HLSQ_CS_CNTL_1(CHIP,
+            .linearlocalidregid = regid(63, 0),
+            .threadsize = thrsz,
+            .unk11 = true,
+            .unk22 = true,
+            .yalign = yalign,
+         )
+      );
    }
 
    if (CHIP == A7XX || a6xx_backend->info->a6xx.has_lpac) {