Module: Mesa
Branch: staging/21.1
Commit: c16da34699d30f30a1f79e02279b990a73babb4b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c16da34699d30f30a1f79e02279b990a73babb4b
Author: Alyssa Rosenzweig <aly...@collabora.com>
Date: Mon May 3 12:37:59 2021 -0400
panfrost: Don't clobber RT0 if RTn is disabled
Fixes: a124c47b9f9 ("panfrost: Fix NULL derefs in pan_cmdstream.c")
Signed-off-by: Alyssa Rosenzweig <aly...@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10393>
(cherry picked from commit dad599f15e2758ac05928fee6570dcbe255fc854)
---
.pick_status.json | 2 +-
src/gallium/drivers/panfrost/pan_cmdstream.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index c1d46da8949..8f6d9710ce5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -877,7 +877,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"
},
diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c
b/src/gallium/drivers/panfrost/pan_cmdstream.c
index 757f6612c0b..360d62b8fc7 100644
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -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;
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
