diff --git a/.pick_status.json b/.pick_status.json
index 4887b933ebc..4c36dcbe881 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2596,7 +2596,7 @@
         "description": "llvmpipe: make sure to initialize the lp_setup_context slots with the default values",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c
index 086f019bc52..8bb10cf186e 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup.c
@@ -1546,6 +1546,11 @@ lp_setup_create(struct pipe_context *pipe,
 
    lp_setup_init_vbuf(setup);
 
+   setup->psize_slot = -1;
+   setup->viewport_index_slot = -1;
+   setup->layer_slot = -1;
+   setup->face_slot = -1;
+
    /* Used only in update_state():
     */
    setup->pipe = pipe;