From be456a3be2aa4419b4d9dfd8340cae6ab6b20e2e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 31 Oct 2022 14:54:14 +1000 Subject: [PATCH] nvk: init dev->physical_device earlier. When device is passed to bo destroy this is needed earlier. Part-of: --- src/nouveau/vulkan/nvk_device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nouveau/vulkan/nvk_device.c b/src/nouveau/vulkan/nvk_device.c index c769c25023c..c6c7ebd689c 100644 --- a/src/nouveau/vulkan/nvk_device.c +++ b/src/nouveau/vulkan/nvk_device.c @@ -140,6 +140,7 @@ nvk_CreateDevice(VkPhysicalDevice physicalDevice, goto fail_alloc; dev->vk.command_buffer_ops = &nvk_cmd_buffer_ops; + dev->pdev = pdev; int ret = nouveau_ws_context_create(pdev->dev, &dev->ctx); if (ret) { @@ -214,8 +215,6 @@ nvk_CreateDevice(VkPhysicalDevice physicalDevice, } pthread_condattr_destroy(&condattr); - dev->pdev = pdev; - void *zero_map; dev->zero_page = nouveau_ws_bo_new_mapped(dev->pdev->dev, 0x1000, 0, NOUVEAU_WS_BO_LOCAL,