From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Wed, 8 Apr 2020 17:35:34 +0000 (-0400)
Subject: pan/bi: Fix nondeterministic register packing
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=90e02db9a13527cc5c64d83201614181cc95c131;p=mesa.git

pan/bi: Fix nondeterministic register packing

Uninitialized read.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4505>
---

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 519bc713041..ae2a6df30f2 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -353,7 +353,7 @@ static uint64_t
 bi_pack_registers(struct bi_registers regs)
 {
         enum bifrost_reg_control ctrl = bi_pack_register_ctrl(regs);
-        struct bifrost_regs s;
+        struct bifrost_regs s = { 0 };
         uint64_t packed = 0;
 
         if (regs.enabled[1]) {
@@ -375,6 +375,7 @@ bi_pack_registers(struct bi_registers regs)
                 s.reg0 = regs.port[0];
         } else {
                 /* Port 1 disabled, so set to zero and use port 1 for ctrl */
+                s.ctrl = 0;
                 s.reg1 = ctrl << 2;
 
                 if (regs.enabled[0]) {