diff --git a/.pick_status.json b/.pick_status.json
index 32f1b188e85..cb56e24c2d7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -7384,7 +7384,7 @@
         "description": "v3d: fix `dirty` bitset being too small to accept V3D_DIRTY_SSBO",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "45bb8f2957108056de10721d50259e2f8c5a4ddc"
     },
diff --git a/src/gallium/drivers/v3d/v3d_uniforms.c b/src/gallium/drivers/v3d/v3d_uniforms.c
index d316195dd53..1b1048626bc 100644
--- a/src/gallium/drivers/v3d/v3d_uniforms.c
+++ b/src/gallium/drivers/v3d/v3d_uniforms.c
@@ -450,7 +450,7 @@ v3d_write_uniforms(struct v3d_context *v3d, struct v3d_job *job,
 void
 v3d_set_shader_uniform_dirty_flags(struct v3d_compiled_shader *shader)
 {
-        uint32_t dirty = 0;
+        uint64_t dirty = 0;
 
         for (int i = 0; i < shader->prog_data.base->uniforms.count; i++) {
                 switch (shader->prog_data.base->uniforms.contents[i]) {