From: Dave Airlie <airlied@redhat.com>
Date: Mon, 31 Oct 2022 04:54:14 +0000 (+1000)
Subject: nvk: init dev->physical_device earlier.
X-Git-Tag: upstream/23.3.3~4000
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be456a3be2aa4419b4d9dfd8340cae6ab6b20e2e;p=platform%2Fupstream%2Fmesa.git

nvk: init dev->physical_device earlier.

When device is passed to bo destroy this is needed earlier.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---

diff --git a/src/nouveau/vulkan/nvk_device.c b/src/nouveau/vulkan/nvk_device.c
index c769c25..c6c7ebd 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,