diff --git a/.pick_status.json b/.pick_status.json
index 528da3d0d43..4d964fd08a0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3864,7 +3864,7 @@
         "description": "tu/drm/virtio: Move set_iova into success path of virtio_bo_init_dmabuf",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "db88a490b8d257b5409dc2161c28838a6bd53160",
         "notes": null
diff --git a/src/freedreno/vulkan/tu_knl_drm_virtio.cc b/src/freedreno/vulkan/tu_knl_drm_virtio.cc
index 7615ed73721..6db0645e106 100644
--- a/src/freedreno/vulkan/tu_knl_drm_virtio.cc
+++ b/src/freedreno/vulkan/tu_knl_drm_virtio.cc
@@ -853,10 +853,9 @@ virtio_bo_init_dmabuf(struct tu_device *dev,
       memset(bo, 0, sizeof(*bo));
    } else {
       *out_bo = bo;
+      set_iova(dev, bo->res_id, iova);
    }
 
-   set_iova(dev, bo->res_id, iova);
-
 out_unlock:
    u_rwlock_wrunlock(&dev->dma_bo_lock);
    return result;