commit ddd82c3ab8ced10b99ea87c444d4c0fa19f2fee6
author Boris Brezillon <boris.brezillon@collabora.com> Wed Sep 09 10:46:03 2020 +0200
committer Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Mon Sep 21 07:34:44 2020 -0400
tree 8a0aa0ea3d213f3c9480e80ae81b704dfd4d0f5e
parent 66f25dd210f4819136a23890173f93b89a4d7779

panfrost: gen_pack: Fix __gen_unpack_uint()

The mask should be a 64-bit value and we should promote cl bytes to u64
before shifting them.

Fixes: 75cc5b8c2922 ("panfrost: Adopt gen_pack_header.py via v3d")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6797>

src/panfrost/lib/gen_pack.py

diff --git a/src/panfrost/lib/gen_pack.py b/src/panfrost/lib/gen_pack.py
index 2dbf2d0..3cf96eb 100644
--- a/src/panfrost/lib/gen_pack.py
+++ b/src/panfrost/lib/gen_pack.py
@@ -102,10 +102,10 @@
 {
    uint64_t val = 0;
    const int width = end - start + 1;
-   const uint32_t mask = (width == 32 ? ~0 : (1 << width) - 1 );
+   const uint64_t mask = (width == 64 ? ~0 : (1ull << width) - 1 );
 
    for (int byte = start / 8; byte <= end / 8; byte++) {
-      val |= cl[byte] << ((byte - start / 8) * 8);
+      val |= ((uint64_t) cl[byte]) << ((byte - start / 8) * 8);
    }
 
    return (val >> (start % 8)) & mask;