diff --git a/.pick_status.json b/.pick_status.json
index d6cd364acdc..38e82725b4f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -679,7 +679,7 @@
         "description": "panfrost: Respect buffer offset for OpenCL",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "80b90a0f2b83291da69f7eef38395e61e919ab97"
     },
diff --git a/src/gallium/drivers/panfrost/pan_compute.c b/src/gallium/drivers/panfrost/pan_compute.c
index 1759252e542..93f9078bb3c 100644
--- a/src/gallium/drivers/panfrost/pan_compute.c
+++ b/src/gallium/drivers/panfrost/pan_compute.c
@@ -123,8 +123,17 @@ panfrost_set_global_binding(struct pipe_context *pctx,
                 util_range_add(&rsrc->base, &rsrc->valid_buffer_range,
                                 0, rsrc->base.width0);
 
-                /* The handle points to uint32_t, but space is allocated for 64 bits */
-                memcpy(handles[i], &rsrc->image.data.bo->ptr.gpu, sizeof(mali_ptr));
+                /* The handle points to uint32_t, but space is allocated for 64
+                 * bits. We need to respect the offset passed in. This interface
+                 * is so bad.
+                 */
+                mali_ptr addr = 0;
+                static_assert(sizeof(addr) == 8, "size out of sync");
+
+                memcpy(&addr, handles[i], sizeof(addr));
+                addr += rsrc->image.data.bo->ptr.gpu;
+
+                memcpy(handles[i], &addr, sizeof(addr));
         }
 }