From: Marek Olšák Date: Thu, 30 Jul 2020 12:32:15 +0000 (-0400) Subject: radeonsi: remove the NGG hack decreasing LDS usage to deal with overflows X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e2e700f6053d0b16ba46e4d5c5b20e965fb2224e;p=mesa.git 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 Part-of: --- 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;