From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Tue, 31 Jan 2023 02:12:01 +0000 (-0600)
Subject: nvk: Implement VK_EXT_pci_bus_info
X-Git-Tag: upstream/23.3.3~4161
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3f5211137f70b122a7909a63578b1a0f1146011;p=platform%2Fupstream%2Fmesa.git

nvk: Implement VK_EXT_pci_bus_info

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

diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index f4879e6..496bf7c 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -268,6 +268,15 @@ nvk_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
          continue;
 
       switch (ext->sType) {
+      case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT: {
+         VkPhysicalDevicePCIBusInfoPropertiesEXT *p = (void *)ext;
+         p->pciDomain = pdev->info.pci_domain;
+         p->pciBus = pdev->info.pci_bus;
+         p->pciDevice = pdev->info.pci_dev;
+         p->pciFunction = pdev->info.pci_func;
+         break;
+      }
+
       /* More property structs */
       default:
          break;
@@ -365,6 +374,13 @@ nvk_physical_device_try_create(struct nvk_instance *instance,
    device->instance = instance;
    device->dev = ndev;
    device->info = (struct nv_device_info) {
+      .pci_domain       = drm_device->businfo.pci->domain,
+      .pci_bus          = drm_device->businfo.pci->bus,
+      .pci_dev          = drm_device->businfo.pci->dev,
+      .pci_func         = drm_device->businfo.pci->func,
+      .pci_device_id    = drm_device->deviceinfo.pci->device_id,
+      .pci_revision_id  = drm_device->deviceinfo.pci->revision_id,
+
       .cls_copy = ndev->cls_copy,
       .cls_eng2d = ndev->cls_eng2d,
       .cls_eng3d = ndev->cls_eng3d,