From: Karol Herbst <kherbst@redhat.com>
Date: Wed, 1 Jun 2022 20:14:41 +0000 (+0200)
Subject: nvk: allocate a GPU context for each VkDevice
X-Git-Tag: upstream/23.3.3~4599
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=decb8c6fd435e1cd42c4a522504baf78eb48e0be;p=platform%2Fupstream%2Fmesa.git

nvk: allocate a GPU context for each VkDevice

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 4d0b7cd..1a648fd 100644
--- a/src/nouveau/vulkan/nvk_device.c
+++ b/src/nouveau/vulkan/nvk_device.c
@@ -3,6 +3,8 @@
 #include "nvk_instance.h"
 #include "nvk_physical_device.h"
 
+#include "nouveau_context.h"
+
 #include "vulkan/wsi/wsi_common.h"
 
 static VkResult
@@ -38,9 +40,18 @@ nvk_CreateDevice(VkPhysicalDevice physicalDevice,
    if (result != VK_SUCCESS)
       goto fail_alloc;
 
+   int ret = nouveau_ws_context_create(physical_device->dev, &device->ctx);
+   if (ret) {
+      if (ret == -ENOSPC)
+         result = vk_error(device, VK_ERROR_TOO_MANY_OBJECTS);
+      else
+         result = vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
+      goto fail_init;
+   }
+
    result = vk_queue_init(&device->queue, &device->vk, &pCreateInfo->pQueueCreateInfos[0], 0);
    if (result != VK_SUCCESS)
-      goto fail_init;
+      goto fail_ctx;
 
    device->queue.driver_submit = nvk_queue_submit;
 
@@ -50,7 +61,9 @@ nvk_CreateDevice(VkPhysicalDevice physicalDevice,
 
    return VK_SUCCESS;
 
- fail_init:
+fail_ctx:
+   nouveau_ws_context_destroy(device->ctx);
+fail_init:
    vk_device_finish(&device->vk);
 fail_alloc:
    vk_free(&device->vk.alloc, device);
@@ -67,5 +80,6 @@ nvk_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator)
 
    vk_queue_finish(&device->queue);
    vk_device_finish(&device->vk);
+   nouveau_ws_context_destroy(device->ctx);
    vk_free(&device->vk.alloc, device);
 }
diff --git a/src/nouveau/vulkan/nvk_device.h b/src/nouveau/vulkan/nvk_device.h
index d080f9c..d54a32f 100644
--- a/src/nouveau/vulkan/nvk_device.h
+++ b/src/nouveau/vulkan/nvk_device.h
@@ -6,11 +6,15 @@
 #include "vulkan/runtime/vk_device.h"
 #include "vulkan/runtime/vk_queue.h"
 
+struct novueau_ws_context;
 struct nvk_physical_device;
+
 struct nvk_device {
    struct vk_device vk;
    struct nvk_physical_device *pdev;
 
+   struct nouveau_ws_context *ctx;
+
    struct vk_queue queue;
 };