diff --git a/.pick_status.json b/.pick_status.json
index 65deefd26e0..ed6349b9210 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2274,7 +2274,7 @@
         "description": "ir3: Use correct immediate size for constlen calculation",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "86f3c0c4c2c0044e3b75bcb68079bbf7b5e77243",
         "notes": null
diff --git a/src/freedreno/ir3/ir3_shader.h b/src/freedreno/ir3/ir3_shader.h
index a6d7be5676c..ec04ae8170b 100644
--- a/src/freedreno/ir3/ir3_shader.h
+++ b/src/freedreno/ir3/ir3_shader.h
@@ -1085,7 +1085,7 @@ static inline unsigned
 ir3_constlen(const struct ir3_shader_variant *v)
 {
    return ir3_const_state(v)->allocs.max_const_offset_vec4 +
-          v->imm_state.size / 4;
+          DIV_ROUND_UP(v->imm_state.count, 4);
 }
 
 static inline unsigned