diff --git a/.pick_status.json b/.pick_status.json
index 0a7b1434ce9..0cdfbf877de 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1544,7 +1544,7 @@
         "description": "Revert \"v3d: never replace a mapped bo\"",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/broadcom/ci/traces-broadcom.yml b/src/broadcom/ci/traces-broadcom.yml
index 3ed047b5eed..1ea5edc94ce 100644
--- a/src/broadcom/ci/traces-broadcom.yml
+++ b/src/broadcom/ci/traces-broadcom.yml
@@ -233,6 +233,7 @@ traces:
       label: [skip, timeout]
       checksum: 512c305e645e2ec62d94976d86f42f1b
     broadcom-rpi5:
+      label: [crash]
       checksum: 512c305e645e2ec62d94976d86f42f1b
 
   valve/portal-2-v2.trace:
diff --git a/src/gallium/drivers/v3d/v3d_resource.c b/src/gallium/drivers/v3d/v3d_resource.c
index 169e10a2135..de27fe8f357 100644
--- a/src/gallium/drivers/v3d/v3d_resource.c
+++ b/src/gallium/drivers/v3d/v3d_resource.c
@@ -101,10 +101,6 @@ v3d_resource_bo_alloc(struct v3d_resource *rsc)
         struct pipe_screen *pscreen = prsc->screen;
         struct v3d_bo *bo;
 
-        /* never replace a mapped bo */
-        if (rsc->bo && rsc->bo->map)
-                return false;
-
         /* Buffers may be read using ldunifa, which prefetches the next
          * 4 bytes after a read. If the buffer's size is exactly a multiple
          * of a page size and the shader reads the last 4 bytes with ldunifa