From 9f5576771a712bcf64acb9cc6469345b3a21fa23 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Mon, 14 Jun 2021 09:53:45 +0200 Subject: [PATCH] radeonsi: skip instance_count==0 draws on <= GFX9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes seems to prevent a hang, at least on Renoir chips. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4866 Cc: mesa-stable Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 66dbd16f38e6acccb9ba3ba02d0f9bbb18e4e3b1) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_state_draw.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a9d3728cae7..6cc3e19accb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -139,7 +139,7 @@ "description": "radeonsi: skip instance_count==0 draws on <= GFX9", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/radeonsi/si_state_draw.cpp b/src/gallium/drivers/radeonsi/si_state_draw.cpp index 806491b7ca4..1cfdfa1f073 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.cpp +++ b/src/gallium/drivers/radeonsi/si_state_draw.cpp @@ -1755,8 +1755,10 @@ static void si_draw_vbo(struct pipe_context *ctx, /* GFX6-GFX7 treat instance_count==0 as instance_count==1. There is * no workaround for indirect draws, but we can at least skip * direct draws. + * 'instance_count == 0' seems to be problematic on Renoir chips (#4866), + * so simplify the condition and drop these draws for all <= GFX9 chips. */ - if (GFX_VERSION <= GFX7 && unlikely(!indirect && !instance_count)) + if (GFX_VERSION <= GFX9 && unlikely(!indirect && !instance_count)) return; struct si_shader_selector *vs = sctx->shader.vs.cso;