diff --git a/.pick_status.json b/.pick_status.json
index 9c5adfafc3f..abc8ed856d3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -652,7 +652,7 @@
         "description": "v3d: use util_unreference_framebuffer_state to unref fb state",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f5bde99cbdd208916795dc463663ddd97428ecc1"
     },
diff --git a/src/gallium/drivers/v3d/v3d_context.c b/src/gallium/drivers/v3d/v3d_context.c
index 6dbc2d8b6bb..145e330ddaa 100644
--- a/src/gallium/drivers/v3d/v3d_context.c
+++ b/src/gallium/drivers/v3d/v3d_context.c
@@ -282,10 +282,7 @@ v3d_context_destroy(struct pipe_context *pctx)
 
         slab_destroy_child(&v3d->transfer_pool);
 
-        for (int i = 0; i < v3d->framebuffer.nr_cbufs; i++)
-                pipe_surface_reference(&v3d->framebuffer.cbufs[i], NULL);
-
-        pipe_surface_reference(&v3d->framebuffer.zsbuf, NULL);
+        util_unreference_framebuffer_state(&v3d->framebuffer);
 
         if (v3d->sand8_blit_vs)
                 pctx->delete_vs_state(pctx, v3d->sand8_blit_vs);