fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/bi: Don't assign slots for the blend second source

Browse source 
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: 795638767d ("pan/bi: Use fused dual source blending")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15250>
(cherry picked from commit ba18799ca1)
This commit is contained in:
Icecream95 2022-02-21 16:54:50 +13:00 • committed by Dylan Baker
parent 909b675c19
commit 085a5d96e5
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -562,7 +562,7 @@
"description": "pan/bi: Don't assign slots for the blend second source", "description": "pan/bi: Don't assign slots for the blend second source",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "795638767d142a58b76c91a0719e42536435320f" "because_sha": "795638767d142a58b76c91a0719e42536435320f"
}, },

6
src/panfrost/bifrost/bi_pack.c
View file

@ -114,6 +114,12 @@ bi_assign_slots(bi_tuple *now, bi_tuple *prev)
if (now->add) { if (now->add) {
bi_foreach_src(now->add, src) { 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)) if (!(src == 0 && read_dreg))
bi_assign_slot_read(&now->regs, (now->add)->src[src]); bi_assign_slot_read(&now->regs, (now->add)->src[src]);
} }