panfrost: Avoid integer underflow in rt_count_1
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Tue, 14 Jul 2020 21:08:54 +0000 (17:08 -0400)
committerMarge Bot <eric+marge@anholt.net>
Thu, 16 Jul 2020 19:59:43 +0000 (19:59 +0000)
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>

src/gallium/drivers/panfrost/pan_mfbd.c

index ac890b5c56f47d57be1ac1bfa24a3134519b2df7..7e9d8cb013adec112583d1a1dbdd928005856151 100644 (file)
@@ -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,
         };