diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2020-07-30 08:32:15 -0400 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2020-08-07 11:22:22 -0400 |
| commit | e2e700f6053d0b16ba46e4d5c5b20e965fb2224e (patch) | |
| tree | f5b944d0b9b07eb365d347b999beec02a2796791 | |
| parent | 97456e847e090577b67df7ea0a49183fc5e77462 (diff) | |
radeonsi: remove the NGG hack decreasing LDS usage to deal with overflows
The LDS size can't overflow anymore, so we can use the correct max LDS size.
Fixes: a23802bcb9a - ac,radeonsi: start adding support for gfx10.3
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6137>
| -rw-r--r-- | src/gallium/drivers/radeonsi/gfx10_shader_ngg.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c index b484ebae522..0654ab32855 100644 --- a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c +++ b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c @@ -1917,14 +1917,9 @@ bool gfx10_ngg_calculate_subgroup_info(struct si_shader *shader) const unsigned min_verts_per_prim = gs_type == PIPE_SHADER_GEOMETRY ? max_verts_per_prim : 1; /* All these are in dwords: */ - /* We can't allow using the whole LDS, because GS waves compete with - * other shader stages for LDS space. - * - * TODO: We should really take the shader's internal LDS use into - * account. The linker will fail if the size is greater than - * 8K dwords. + /* GE can only use 8K dwords (32KB) of LDS per workgroup. */ - const unsigned max_lds_size = 8 * 1024 - 768; + const unsigned max_lds_size = 8 * 1024 - gfx10_ngg_get_scratch_dw_size(shader); const unsigned target_lds_size = max_lds_size; unsigned esvert_lds_size = 0; unsigned gsprim_lds_size = 0; |