From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Tue, 31 Mar 2020 17:04:18 +0000 (-0400)
Subject: pan/bi: Use STAGE srcs for scheduler nops
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b241c70b6a1f39840aec2fe5db43f0e33221d7b;p=mesa.git

pan/bi: Use STAGE srcs for scheduler nops

..rather than using port 0 for the source, which may or may not actually
exist.

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

diff --git a/src/panfrost/bifrost/bifrost.h b/src/panfrost/bifrost/bifrost.h
index 1a016286608..19d284e555b 100644
--- a/src/panfrost/bifrost/bifrost.h
+++ b/src/panfrost/bifrost/bifrost.h
@@ -492,8 +492,8 @@ struct bifrost_branch {
 
 /* Clause packing */
 
-#define BIFROST_FMA_NOP (0x701960)
-#define BIFROST_ADD_NOP (0x3D960)
+#define BIFROST_FMA_NOP (0x701960 | BIFROST_SRC_STAGE)
+#define BIFROST_ADD_NOP (0x3D960 | BIFROST_SRC_STAGE)
 
 struct bifrost_fmt1 {
         unsigned ins_0 : 3;