diff --git a/.pick_status.json b/.pick_status.json
index dc727901bcf..df42f25d576 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1156,7 +1156,7 @@
         "description": "llvmpipe: fix debug print iterating in set_framebuffer_state",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/llvmpipe/lp_state_surface.c b/src/gallium/drivers/llvmpipe/lp_state_surface.c
index 9c698383ecc..58aea7bed11 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_surface.c
@@ -67,13 +67,13 @@ llvmpipe_set_framebuffer_state(struct pipe_context *pipe,
       const struct util_format_description *depth_desc =
          util_format_description(depth_format);
 
-      if (lp->framebuffer.zsbuf && lp->framebuffer.zsbuf->context != pipe) {
+      if (fb->zsbuf && fb->zsbuf->context != pipe) {
          debug_printf("Illegal setting of fb state with zsbuf created in "
                        "another context\n");
       }
       for (i = 0; i < fb->nr_cbufs; i++) {
-         if (lp->framebuffer.cbufs[i] &&
-             lp->framebuffer.cbufs[i]->context != pipe) {
+         if (fb->cbufs[i] &&
+             fb->cbufs[i]->context != pipe) {
             debug_printf("Illegal setting of fb state with cbuf %d created in "
                           "another context\n", i);
          }