pan/bi: Don't assign slots for the blend second source
authorIcecream95 <ixn@disroot.org>
Mon, 21 Feb 2022 03:54:50 +0000 (16:54 +1300)
committerAlyssa Rosenzweig <alyssa@collabora.com>
Sat, 5 Mar 2022 19:55:00 +0000 (14:55 -0500)
Another instruction might write to the second source, and then an
INSTR_INVALID_ENC fault will be raised because the tuple will write to
and read from the register at the same time.

Fixes: 795638767d1 ("pan/bi: Use fused dual source blending")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15250>

src/panfrost/bifrost/bi_pack.c

index 58a8cb8..239d2f6 100644 (file)
@@ -120,6 +120,12 @@ bi_assign_slots(bi_tuple *now, bi_tuple *prev)
 
         if (now->add) {
                 bi_foreach_src(now->add, src) {
+                        /* This is not a real source, we shouldn't assign a
+                         * slot for it.
+                         */
+                        if (now->add->op == BI_OPCODE_BLEND && src == 4)
+                                continue;
+
                         if (!(src == 0 && read_dreg))
                                 bi_assign_slot_read(&now->regs, (now->add)->src[src]);
                 }