From cf9e82b281dcade0e90f0df59a6400e01863924d Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 29 May 2024 12:03:06 +0200
Subject: [PATCH] freedreno/a6xx: fix kernel -> compute handling

9b2780dcaf folds the kernel path into the compute path, and then adds
a `compute -> compute` conversion that was very likely meant to be
`kernel -> compute`, so fix that.

Fixes: 9b2780dcaf486ebf91e9 ("freedreno/a6xx: Re-work fd6_emit_shader")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29458>
(cherry picked from commit b8f1e95cbe2b18e814252472a4e1407d7cb076af)
---
 .pick_status.json                                 | 2 +-
 src/gallium/drivers/freedreno/a6xx/fd6_program.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a0d887f3ca5..5f35ddfbf9a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1194,7 +1194,7 @@
         "description": "freedreno/a6xx: fix kernel -> compute handling",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "9b2780dcaf486ebf91e9743251d998f97aeccde5",
         "notes": null
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.cc b/src/gallium/drivers/freedreno/a6xx/fd6_program.cc
index 76b76705961..3b5086577bc 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_program.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.cc
@@ -119,7 +119,7 @@ fd6_emit_shader(struct fd_context *ctx, struct fd_ringbuffer *ring,
 #endif
 
    gl_shader_stage type = so->type;
-   if (type == MESA_SHADER_COMPUTE)
+   if (type == MESA_SHADER_KERNEL)
       type = MESA_SHADER_COMPUTE;
 
    enum a6xx_threadsize thrsz =