From 9f6764953b02edc81a19bb7d169e64ed77ab1980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Thu, 14 Oct 2021 14:45:19 +0300 Subject: [PATCH] anv: setup syncobj fd via wsi_device_setup_syncobj_fd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch moves initialization of variable so that we have fd when calling wsi initialization. Signed-off-by: Tapani Pälli Reviewed-by: Jason Ekstrand Part-of: --- src/intel/vulkan/anv_device.c | 4 ++-- src/intel/vulkan/anv_wsi.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index f5df8836439..392cb3007ea 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -1000,6 +1000,8 @@ anv_physical_device_try_create(struct anv_instance *instance, device->engine_info = anv_gem_get_engine_info(fd); anv_physical_device_init_queue_families(device); + device->local_fd = fd; + result = anv_init_wsi(device); if (result != VK_SUCCESS) goto fail_engine_info; @@ -1010,8 +1012,6 @@ anv_physical_device_try_create(struct anv_instance *instance, get_device_extensions(device, &device->vk.supported_extensions); - device->local_fd = fd; - anv_genX(&device->info, init_physical_device_state)(device); *device_out = device; diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index 73fae70b67d..9e462d0b227 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -98,6 +98,9 @@ anv_init_wsi(struct anv_physical_device *physical_device) physical_device->vk.wsi_device = &physical_device->wsi_device; + wsi_device_setup_syncobj_fd(&physical_device->wsi_device, + physical_device->local_fd); + return VK_SUCCESS; }