From a4dfa2bdf894b58e7a6191a0d34d445ea2122ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 30 Jul 2020 07:47:42 -0400 Subject: [PATCH] radeonsi: use correct wave size in gfx10_ngg_calculate_subgroup_info Fixes: 88efb63cafc ("radeonsi/gfx10: implement Wave32") Acked-by: Pierre-Eric Pelloux-Prayer Part-of: (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 bce98af6d85..f26e0ca48e0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3766,7 +3766,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 {