diff --git a/.pick_status.json b/.pick_status.json
index 783328e3d3f..bbbd5f315b1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -644,7 +644,7 @@
         "description": "lavapipe: fix bitmask type for sampler updating",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c
index e6d664dd25e..a050c36b0bd 100644
--- a/src/gallium/frontends/lavapipe/lvp_execute.c
+++ b/src/gallium/frontends/lavapipe/lvp_execute.c
@@ -4499,7 +4499,7 @@ bind_db_samplers(struct rendering_state *state, enum lvp_pipeline_type pipeline_
       return;
    }
    uint8_t *db = state->desc_buffer_addrs[buffer_index] + state->desc_buffer_offsets[pipeline_type][set].offset;
-   uint8_t did_update = 0;
+   uint32_t did_update = 0;
    for (uint32_t binding_index = 0; binding_index < set_layout->binding_count; binding_index++) {
       const struct lvp_descriptor_set_binding_layout *bind_layout = &set_layout->binding[binding_index];
       if (!bind_layout->immutable_samplers)