From 3064feb2350d5fce36a09c85a72788998c3f1c1b Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 10 Sep 2020 16:47:37 -0400
Subject: [PATCH] pan/mdg: Obey f2fmp size restriction in fuse_io_16
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6283>
---
 src/panfrost/midgard/nir_fuse_io_16.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/panfrost/midgard/nir_fuse_io_16.c b/src/panfrost/midgard/nir_fuse_io_16.c
index ed4b7750d04..a588f6ac1fe 100644
--- a/src/panfrost/midgard/nir_fuse_io_16.c
+++ b/src/panfrost/midgard/nir_fuse_io_16.c
@@ -87,6 +87,15 @@ nir_fuse_io_16(nir_shader *shader)
                continue;
 
             intr->dest.ssa.bit_size = 16;
+
+            nir_builder b;
+            nir_builder_init(&b, function->impl);
+            b.cursor = nir_after_instr(instr);
+
+            /* The f2f32(f2fmp(x)) will cancel by opt_algebraic */
+            nir_ssa_def *conv = nir_f2f32(&b, &intr->dest.ssa);
+            nir_ssa_def_rewrite_uses_after(&intr->dest.ssa, nir_src_for_ssa(conv), conv->parent_instr);
+
             progress |= true;
          }
       }