diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c
index d31062d94b4..5981a1e1123 100644
--- a/src/broadcom/vulkan/v3dv_device.c
+++ b/src/broadcom/vulkan/v3dv_device.c
@@ -1443,16 +1443,16 @@ create_physical_device(struct v3dv_instance *instance,
    device->sync_types[2] = NULL;
    device->vk.supported_sync_types = device->sync_types;
 
+   get_device_extensions(device, &device->vk.supported_extensions);
+   get_features(device, &device->vk.supported_features);
+   get_device_properties(device, &device->vk.properties);
+
    result = v3dv_wsi_init(device);
    if (result != VK_SUCCESS) {
       vk_error(instance, result);
       goto fail;
    }
 
-   get_device_extensions(device, &device->vk.supported_extensions);
-   get_features(device, &device->vk.supported_features);
-   get_device_properties(device, &device->vk.properties);
-
    mtx_init(&device->mutex, mtx_plain);
 
    list_addtail(&device->vk.link, &instance->vk.physical_devices.list);