diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/midgard/meson.build
index 80bb0a91388..49c3034c87f 100644
--- a/src/panfrost/midgard/meson.build
+++ b/src/panfrost/midgard/meson.build
@@ -34,6 +34,7 @@ libpanfrost_midgard_files = files(
   'midgard_ops.c',
   'mir_promote_uniforms.c',
   'mir_squeeze.c',
+  'midgard_nir_lower_image_bitsize.c',
   'midgard_opt_copy_prop.c',
   'midgard_opt_dce.c',
   'midgard_opt_perspective.c',
diff --git a/src/panfrost/midgard/midgard_nir.h b/src/panfrost/midgard/midgard_nir.h
index e31949c0c2b..e8f692b4504 100644
--- a/src/panfrost/midgard/midgard_nir.h
+++ b/src/panfrost/midgard/midgard_nir.h
@@ -5,3 +5,4 @@ bool midgard_nir_lower_algebraic_early(nir_shader *shader);
 bool midgard_nir_lower_algebraic_late(nir_shader *shader);
 bool midgard_nir_scale_trig(nir_shader *shader);
 bool midgard_nir_cancel_inot(nir_shader *shader);
+bool midgard_nir_lower_image_bitsize(nir_shader *shader);
diff --git a/src/panfrost/midgard/midgard_nir_lower_image_bitsize.c b/src/panfrost/midgard/midgard_nir_lower_image_bitsize.c
new file mode 100644
index 00000000000..f82f6e2ae35
--- /dev/null
+++ b/src/panfrost/midgard/midgard_nir_lower_image_bitsize.c
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2020 Collabora, Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors (Collabora):
+ *   Italo Nicola <italonicola@collabora.com>
+ */
+
+#include "compiler/nir/nir.h"
+#include "compiler/nir/nir_builder.h"
+#include "midgard_nir.h"
+
+static bool
+nir_lower_image_bitsize(nir_builder *b, nir_instr *instr, UNUSED void *data)
+{
+        if (instr->type != nir_instr_type_intrinsic)
+                return false;
+
+        nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
+
+        switch (intr->intrinsic) {
+        case nir_intrinsic_image_load:
+        case nir_intrinsic_image_store:
+        case nir_intrinsic_image_atomic_add:
+        case nir_intrinsic_image_atomic_and:
+        case nir_intrinsic_image_atomic_comp_swap:
+        case nir_intrinsic_image_atomic_exchange:
+        case nir_intrinsic_image_atomic_imax:
+        case nir_intrinsic_image_atomic_imin:
+        case nir_intrinsic_image_atomic_or:
+        case nir_intrinsic_image_atomic_umax:
+        case nir_intrinsic_image_atomic_umin:
+        case nir_intrinsic_image_atomic_xor:
+                break;
+        default:
+                return false;
+        }
+
+        if (nir_src_bit_size(intr->src[1]) == 16)
+                return false;
+
+        b->cursor = nir_before_instr(instr);
+
+        nir_ssa_def *coord =
+                nir_ssa_for_src(b, intr->src[1],
+                                nir_src_num_components(intr->src[1]));
+
+        nir_ssa_def *coord16 = nir_u2u16(b, coord);
+
+        nir_instr_rewrite_src(instr, &intr->src[1], nir_src_for_ssa(coord16));
+
+        return true;
+}
+
+bool
+midgard_nir_lower_image_bitsize(nir_shader *shader)
+{
+        return nir_shader_instructions_pass(shader,
+                        nir_lower_image_bitsize,
+                        nir_metadata_block_index | nir_metadata_dominance,
+                        NULL);
+}