diff --git a/.pick_status.json b/.pick_status.json
index d7b611bc749..201fa93fc84 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2124,7 +2124,7 @@
         "description": "v3dv: don't overwrite the primary fd if it's already set",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "188f1c6cbe79ca777188718a017482ab6362c425",
         "notes": null
diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c
index f6a8411bbd1..f9181fda0ec 100644
--- a/src/broadcom/vulkan/v3dv_device.c
+++ b/src/broadcom/vulkan/v3dv_device.c
@@ -1587,10 +1587,12 @@ enumerate_devices(struct vk_instance *vk_instance)
       if (devices[i]->bustype != DRM_BUS_PLATFORM)
          continue;
 
-      if ((devices[i]->available_nodes & 1 << DRM_NODE_RENDER))
+      if ((devices[i]->available_nodes & 1 << DRM_NODE_RENDER)) {
          try_device(devices[i]->nodes[DRM_NODE_RENDER], &render_fd, "v3d");
-      if ((devices[i]->available_nodes & 1 << DRM_NODE_PRIMARY))
+      } else if (primary_fd == -1 &&
+                 (devices[i]->available_nodes & 1 << DRM_NODE_PRIMARY)) {
          try_display_device(instance, devices[i]->nodes[DRM_NODE_PRIMARY], &primary_fd);
+      }
 #endif
 
       if (render_fd >= 0 && primary_fd >= 0)