From b72c7c6c5681b38a2c04650c6bc32e12e48d62be Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Mon, 21 Jun 2021 15:11:27 +0200 Subject: [PATCH] radeonsi: fix fb_too_small condition MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit fb->num_layers can be 0 so use util_num_layers(tex) instead. Fixes: f7c58559f57 ("radeonsi: refine fast clears for small buffers, always use them for large HTILE") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4764 Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/si_clear.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_clear.c b/src/gallium/drivers/radeonsi/si_clear.c index 817cc7f..7f236fe 100644 --- a/src/gallium/drivers/radeonsi/si_clear.c +++ b/src/gallium/drivers/radeonsi/si_clear.c @@ -541,7 +541,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers, struct si_clear_info info[8 * 2 + 1]; /* MRTs * (CMASK + DCC) + ZS */ unsigned num_clears = 0; unsigned clear_types = 0; - bool fb_too_small = fb->width * fb->height * fb->layers <= 512 * 512; + unsigned num_pixels = fb->width * fb->height; /* This function is broken in BE, so just disable this path for now */ #if UTIL_ARCH_BIG_ENDIAN @@ -595,6 +595,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers, * * This helps on both dGPUs and APUs, even small APUs like Mullins. */ + bool fb_too_small = num_pixels * num_layers <= 512 * 512; bool too_small = tex->buffer.b.b.nr_samples <= 1 && fb_too_small; bool eliminate_needed = false; bool fmask_decompress_needed = false; @@ -768,6 +769,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers, unsigned level = zsbuf->u.tex.level; bool update_db_depth_clear = false; bool update_db_stencil_clear = false; + bool fb_too_small = num_pixels * zs_num_layers <= 512 * 512; /* Transition from TC-incompatible to TC-compatible HTILE if requested. */ if (zstex->enable_tc_compatible_htile_next_clear) { -- 2.7.4