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

panfrost: Don't clobber RT0 if RTn is disabled

Browse source 
Fixes: a124c47b9f ("panfrost: Fix NULL derefs in pan_cmdstream.c")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10393>
(cherry picked from commit dad599f15e)
This commit is contained in:
Alyssa Rosenzweig 2021-05-03 12:37:59 -04:00 • committed by Eric Engestrom
parent cb7b9f08e8
commit 06f5c009da
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4450,7 +4450,7 @@
"description": "panfrost: Don't clobber RT0 if RTn is disabled",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "a124c47b9f90c3f18032928c24a06d157a0334c1"
},

2
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -298,7 +298,7 @@ panfrost_emit_bifrost_blend(struct panfrost_batch *batch,
for (unsigned i = 0; i < MAX2(rt_count, 1); ++i) {
/* Disable blending for unbacked render targets */
if (rt_count == 0 || !batch->key.cbufs[i]) {
pan_pack(rts, BLEND, cfg) {
pan_pack(rts + i * MALI_BLEND_LENGTH, BLEND, cfg) {
cfg.enable = false;
cfg.bifrost.internal.mode = MALI_BIFROST_BLEND_MODE_OFF;
}