Mesa (staging/21.0): radv: correctly enable WGP_MODE for tessellation control

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 3f0b1c02e8de8c6078281d397e873ec4f5c9d64f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f0b1c02e8de8c6078281d397e873ec4f5c9d64f

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Tue Feb  2 11:13:11 2021 +0000

radv: correctly enable WGP_MODE for tessellation control

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8811>
(cherry picked from commit 0602d4ec69779db11008a8e370b1c46442fc7784)

---

 .pick_status.json            | 2 +-
 src/amd/vulkan/radv_shader.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 855391cbe9e..aa3c9417632 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -247,7 +247,7 @@
         "description": "radv: correctly enable WGP_MODE for tessellation control",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 9fd0f1ba853..c921743874e 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -985,7 +985,7 @@ static void radv_postprocess_config(const struct radv_device *device,
 					     S_00B12C_EXCP_EN(excp_en);
 		}
 		config_out->rsrc1 |= S_00B428_MEM_ORDERED(pdevice->rad_info.chip_class >= GFX10) |
-				     S_00B848_WGP_MODE(pdevice->rad_info.chip_class >= GFX10);
+				     S_00B428_WGP_MODE(pdevice->rad_info.chip_class >= GFX10);
 		config_out->rsrc2 |= S_00B42C_SHARED_VGPR_CNT(num_shared_vgpr_blocks);
 		break;
 	case MESA_SHADER_VERTEX: