Mesa (master): pan/bi: Fix outmod/roundmode flip

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 1b16d6354bc9f64ed97fc400977e3ffcb4c09268
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b16d6354bc9f64ed97fc400977e3ffcb4c09268

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Tue Mar 31 22:18:03 2020 -0400

pan/bi: Fix outmod/roundmode flip

I misread the disassembler, the fields are in the other order.

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

---

 src/panfrost/bifrost/bifrost.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panfrost/bifrost/bifrost.h b/src/panfrost/bifrost/bifrost.h
index 19d284e555b..74718eaa316 100644
--- a/src/panfrost/bifrost/bifrost.h
+++ b/src/panfrost/bifrost/bifrost.h
@@ -204,8 +204,8 @@ struct bifrost_fma_add {
         unsigned src1_neg : 1;
         unsigned unk : 3;
         unsigned src0_abs : 1;
-        enum bifrost_outmod outmod : 2;
         enum bifrost_roundmode roundmode : 2;
+        enum bifrost_outmod outmod : 2;
         unsigned op : 6;
 } __attribute__((packed));
 
@@ -222,9 +222,9 @@ struct bifrost_fma_add_minmax16 {
         unsigned src1_neg : 1;
         unsigned src0_swizzle : 2;
         unsigned src1_swizzle : 2;
+        unsigned mode : 2;
         enum bifrost_outmod outmod : 2;
         /* roundmode for add, min/max mode for min/max */
-        unsigned mode : 2;
         unsigned op : 6;
 } __attribute__((packed));