From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Tue, 14 Jul 2020 21:08:54 +0000 (-0400)
Subject: panfrost: Avoid integer underflow in rt_count_1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9addb82148c487d6660aecea1af370c2d21d1788;p=mesa.git

panfrost: Avoid integer underflow in rt_count_1

If rt_count = 0, this underflows to MAX_MRT. The hw doesn't seem to care
but it's semantically incorrect and confuses pandecode.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5858>
---

diff --git a/src/gallium/drivers/panfrost/pan_mfbd.c b/src/gallium/drivers/panfrost/pan_mfbd.c
index ac890b5c56f..7e9d8cb013a 100644
--- a/src/gallium/drivers/panfrost/pan_mfbd.c
+++ b/src/gallium/drivers/panfrost/pan_mfbd.c
@@ -482,7 +482,7 @@ panfrost_emit_mfbd(struct panfrost_batch *batch, unsigned vertex_count)
                 /* Seems to configure tib size */
                 .unk1 = pan_is_large_tib(batch) ? 0xc80 : 0x1080,
 
-                .rt_count_1 = MALI_POSITIVE(batch->key.nr_cbufs),
+                .rt_count_1 = MALI_POSITIVE(MAX2(batch->key.nr_cbufs, 1)),
                 .rt_count_2 = 4,
         };