Mesa (staging/21.3): panfrost: Don't shadow Mesa's fui()

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: cabbae2902820746fd5d481737e069e117c65e81
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cabbae2902820746fd5d481737e069e117c65e81

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Thu Nov 18 22:43:36 2021 -0500

panfrost: Don't shadow Mesa's fui()

Will fix a compiler error when we #include the Valhall disassembler
header from pandecode.

Fixes: 688827f3c52 ("pan/va: Add disassembler generator")
Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14063>
(cherry picked from commit 745d7db74813b8e1ce52c879e0bbffde2ca6e6c1)

---

 .pick_status.json                          | 2 +-
 src/panfrost/bifrost/valhall/disassemble.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 98ee78ed8f6..4fd776ff615 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2110,7 +2110,7 @@
         "description": "panfrost: Don't shadow Mesa's fui()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "688827f3c5280961ab096c342ea5834ccef8463e"
     },
diff --git a/src/panfrost/bifrost/valhall/disassemble.h b/src/panfrost/bifrost/valhall/disassemble.h
index 5cd644f0303..46f5bf139a5 100644
--- a/src/panfrost/bifrost/valhall/disassemble.h
+++ b/src/panfrost/bifrost/valhall/disassemble.h
@@ -13,7 +13,6 @@
 #define MASK(count) ((1ull << (count)) - 1)
 #define SEXT(b, count) ((b ^ BIT(count - 1)) - BIT(count - 1))
 #define UNUSED __attribute__((unused))
-static inline float fui(uint32_t u) { float f; memcpy(&f, &u, 4); return f; }
 
 #define VA_SRC_UNIFORM_TYPE 0x2
 #define VA_SRC_IMM_TYPE 0x3