From e1736c7fdb203b3511db0d580f1af99b51f4b68e Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 21 Oct 2020 16:32:55 -0700 Subject: [PATCH] radesonsi: Remove unnecessary shader->selector NULL check. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit shader->selector->info.stage == MESA_SHADER_COMPUTE at this case statement. Fix defect reported by Coverity Scan. Dereference before null check (REVERSE_INULL) check_after_deref: Null-checking shader->selector suggests that it may be null, but it has already been dereferenced on all paths leading to the check. Signed-off-by: Vinson Lee Reviewed-by: Timothy Arceri Reviewed-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/si_shader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 302bd72666d..2ab836febbe 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -990,8 +990,7 @@ static void si_calculate_max_simd_waves(struct si_shader *shader) */ lds_per_wave = conf->lds_size * lds_increment + align(num_inputs * 48, lds_increment); break; - case MESA_SHADER_COMPUTE: - if (shader->selector) { + case MESA_SHADER_COMPUTE: { unsigned max_workgroup_size = si_get_max_workgroup_size(shader); lds_per_wave = (conf->lds_size * lds_increment) / DIV_ROUND_UP(max_workgroup_size, sscreen->compute_wave_size);