From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Thu, 20 Jul 2023 16:32:19 +0000 (-0500)
Subject: nvk: Only advertise EXT_pci_bus_info on discrete GPUs
X-Git-Tag: upstream/23.3.3~3835
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b232e42532bdb47600633c59c6faa58e970c5cc5;p=platform%2Fupstream%2Fmesa.git

nvk: Only advertise EXT_pci_bus_info on discrete GPUs

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 f8211b1..19fd445 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -251,6 +251,7 @@ nvk_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
 
       case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT: {
          VkPhysicalDevicePCIBusInfoPropertiesEXT *p = (void *)ext;
+         assert(pdev->info.type == NV_DEVICE_TYPE_DIS);
          p->pciDomain = pdev->info.pci_domain;
          p->pciBus = pdev->info.pci_bus;
          p->pciDevice = pdev->info.pci_dev;
@@ -367,7 +368,7 @@ nvk_get_device_extensions(const struct nv_device_info *info,
       .EXT_inline_uniform_block = true,
       .EXT_mutable_descriptor_type = true,
       .EXT_non_seamless_cube_map = true,
-      .EXT_pci_bus_info = true,
+      .EXT_pci_bus_info = info->type == NV_DEVICE_TYPE_DIS,
       .EXT_private_data = true,
       .EXT_provoking_vertex = true,
       .EXT_robustness2 = true,