Mesa (master): pan/midg: Fix midgard_pack_common_store_mask()

[GitLab Mirror]

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

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Thu Apr 22 12:21:31 2021 +0200

pan/midg: Fix midgard_pack_common_store_mask()

st_u64() gets an invalid mask when component Y is written.

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10332>

---

 src/panfrost/midgard/midgard_emit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panfrost/midgard/midgard_emit.c b/src/panfrost/midgard/midgard_emit.c
index 53e227d8ed0..037e92a7288 100644
--- a/src/panfrost/midgard/midgard_emit.c
+++ b/src/panfrost/midgard/midgard_emit.c
@@ -449,7 +449,7 @@ midgard_pack_common_store_mask(midgard_instruction *ins) {
                                         if (comp_sz == total_sz)
                                                 packed |= 0xF;
                                         else if (comp_sz == total_sz / 2)
-                                                packed |= 0x3 << i;
+                                                packed |= 0x3 << (i * 2);
                                         else if (comp_sz == total_sz / 4)
                                                 packed |= 0x1 << i;
                                 }