Mesa (staging/20.1): radeonsi: use correct wave size in gfx10_ngg_calculate_subgroup_info

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 7eafd5a305a44ce44f84ca07b93315a57f87b8e4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7eafd5a305a44ce44f84ca07b93315a57f87b8e4

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Jul 30 07:47:42 2020 -0400

radeonsi: use correct wave size in gfx10_ngg_calculate_subgroup_info

Fixes: 88efb63cafc ("radeonsi/gfx10: implement Wave32")

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6137>
(cherry picked from commit b6fb09fd843293a4e5269cc457b6685435822d31)

---

 .pick_status.json                               | 2 +-
 src/gallium/drivers/radeonsi/gfx10_shader_ngg.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7f44d722102..3eb233b6dc5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -148,7 +148,7 @@
         "description": "radeonsi: use correct wave size in gfx10_ngg_calculate_subgroup_info",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "88efb63cafcf249a370ee27683c41afde3b95ffd"
     },
diff --git a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
index 06eba4a1f61..c9fdceef605 100644
--- a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
+++ b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
@@ -1990,7 +1990,7 @@ void gfx10_ngg_calculate_subgroup_info(struct si_shader *shader)
 
    /* Round up towards full wave sizes for better ALU utilization. */
    if (!max_vert_out_per_gs_instance) {
-      const unsigned wavesize = gs_sel->screen->ge_wave_size;
+      const unsigned wavesize = si_get_shader_wave_size(shader);
       unsigned orig_max_esverts;
       unsigned orig_max_gsprims;
       do {