From dad599f15e2758ac05928fee6570dcbe255fc854 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 3 May 2021 12:37:59 -0400 Subject: [PATCH] panfrost: Don't clobber RT0 if RTn is disabled Fixes: a124c47b9f9 ("panfrost: Fix NULL derefs in pan_cmdstream.c") Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_cmdstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 6936dd0c442..973536aad4e 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; }