diff --git a/src/broadcom/cle/gen_pack_header.py b/src/broadcom/cle/gen_pack_header.py
index 1cc2446d0bd..5d990b9fea7 100644
--- a/src/broadcom/cle/gen_pack_header.py
+++ b/src/broadcom/cle/gen_pack_header.py
@@ -522,6 +522,11 @@ class Parser(object):
         print("static inline void\n%s_pack(__gen_user_data *data, uint8_t * restrict cl,\n%sconst struct %s * restrict values)\n{" %
               (name, ' ' * (len(name) + 6), name))
 
+        if name in ("V3D71_TILE_BINNING_MODE_CFG",
+                    "V3D71_TILE_RENDERING_MODE_CFG_COMMON"):
+            print("   assert(values->log2_tile_width == values->log2_tile_height ||")
+            print("          values->log2_tile_width == values->log2_tile_height + 1);")
+
         group.emit_pack_function(0)
 
         print("}\n")
diff --git a/src/broadcom/vulkan/v3dvx_cmd_buffer.c b/src/broadcom/vulkan/v3dvx_cmd_buffer.c
index e8a089cc1d5..1ce6e96b3fb 100644
--- a/src/broadcom/vulkan/v3dvx_cmd_buffer.c
+++ b/src/broadcom/vulkan/v3dvx_cmd_buffer.c
@@ -97,12 +97,6 @@ v3dX(job_emit_binning_prolog)(struct v3dv_job *job,
 #if V3D_VERSION >= 71
       config.log2_tile_width = log2_tile_size(tiling->tile_width);
       config.log2_tile_height = log2_tile_size(tiling->tile_height);
-      /* FIXME: ideally we would like next assert on the packet header (as is
-       * general, so also applies to GL). We would need to expand
-       * gen_pack_header for that.
-       */
-      assert(config.log2_tile_width == config.log2_tile_height ||
-             config.log2_tile_width == config.log2_tile_height + 1);
 #endif
    }
 
@@ -977,12 +971,6 @@ v3dX(cmd_buffer_emit_render_pass_rcl)(struct v3dv_cmd_buffer *cmd_buffer)
 #if V3D_VERSION >= 71
       config.log2_tile_width = log2_tile_size(tiling->tile_width);
       config.log2_tile_height = log2_tile_size(tiling->tile_height);
-      /* FIXME: ideallly we would like next assert on the packet header (as is
-       * general, so also applies to GL). We would need to expand
-       * gen_pack_header for that.
-       */
-      assert(config.log2_tile_width == config.log2_tile_height ||
-             config.log2_tile_width == config.log2_tile_height + 1);
 #endif
 
       if (ds_attachment_idx != VK_ATTACHMENT_UNUSED) {
diff --git a/src/broadcom/vulkan/v3dvx_meta_common.c b/src/broadcom/vulkan/v3dvx_meta_common.c
index 6b12c6b775a..642b5501229 100644
--- a/src/broadcom/vulkan/v3dvx_meta_common.c
+++ b/src/broadcom/vulkan/v3dvx_meta_common.c
@@ -65,12 +65,6 @@ emit_rcl_prologue(struct v3dv_job *job,
 #if V3D_VERSION >= 71
       config.log2_tile_width = log2_tile_size(tiling->tile_width);
       config.log2_tile_height = log2_tile_size(tiling->tile_height);
-      /* FIXME: ideallly we would like next assert on the packet header (as is
-       * general, so also applies to GL). We would need to expand
-       * gen_pack_header for that.
-       */
-      assert(config.log2_tile_width == config.log2_tile_height ||
-             config.log2_tile_width == config.log2_tile_height + 1);
 #endif
       config.internal_depth_type = fb->internal_depth_type;
    }
diff --git a/src/gallium/drivers/v3d/v3dx_draw.c b/src/gallium/drivers/v3d/v3dx_draw.c
index 11b78e91433..5cd0b2f5748 100644
--- a/src/gallium/drivers/v3d/v3dx_draw.c
+++ b/src/gallium/drivers/v3d/v3dx_draw.c
@@ -74,13 +74,6 @@ v3dX(start_binning)(struct v3d_context *v3d, struct v3d_job *job)
 
                 config.log2_tile_width = log2_tile_size(job->tile_desc.width);
                 config.log2_tile_height = log2_tile_size(job->tile_desc.height);
-
-                /* FIXME: ideallly we would like next assert on the packet header (as is
-                 * general, so also applies to GL). We would need to expand
-                 * gen_pack_header for that.
-                 */
-                assert(config.log2_tile_width == config.log2_tile_height ||
-                       config.log2_tile_width == config.log2_tile_height + 1);
         }
 #endif
 
diff --git a/src/gallium/drivers/v3d/v3dx_rcl.c b/src/gallium/drivers/v3d/v3dx_rcl.c
index f41d65fa2bb..45f64ac5c25 100644
--- a/src/gallium/drivers/v3d/v3dx_rcl.c
+++ b/src/gallium/drivers/v3d/v3dx_rcl.c
@@ -769,13 +769,6 @@ v3dX(emit_rcl)(struct v3d_job *job)
 #if V3D_VERSION >= 71
                 config.log2_tile_width = log2_tile_size(job->tile_desc.width);
                 config.log2_tile_height = log2_tile_size(job->tile_desc.height);
-
-                /* FIXME: ideallly we would like next assert on the packet header (as is
-                 * general, so also applies to GL). We would need to expand
-                 * gen_pack_header for that.
-                 */
-                assert(config.log2_tile_width == config.log2_tile_height ||
-                       config.log2_tile_width == config.log2_tile_height + 1);
 #endif
 
         }