fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: remove private pci fields

Browse source 
These fields are in the base device struct 'intel_device_info' now.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5489

Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13936>
This commit is contained in:
Jianxun Zhang 2022-01-06 10:43:13 -08:00 • committed by Marge Bot
parent d86989bf73
commit 3414ba9a81
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/intel/vulkan/anv_device.c
View file

@ -802,11 +802,6 @@ anv_physical_device_try_create(struct anv_instance *instance,
device->info = devinfo;
device->is_alpha = is_alpha;
device->pci_info.domain = drm_device->businfo.pci->domain;
device->pci_info.bus = drm_device->businfo.pci->bus;
device->pci_info.device = drm_device->businfo.pci->dev;
device->pci_info.function = drm_device->businfo.pci->func;
device->cmd_parser_version = -1;
if (device->info.ver == 7) {
device->cmd_parser_version =
@ -2320,10 +2315,10 @@ void anv_GetPhysicalDeviceProperties2(
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT: {
VkPhysicalDevicePCIBusInfoPropertiesEXT *properties =
(VkPhysicalDevicePCIBusInfoPropertiesEXT *)ext;
properties->pciDomain = pdevice->pci_info.domain;
properties->pciBus = pdevice->pci_info.bus;
properties->pciDevice = pdevice->pci_info.device;
properties->pciFunction = pdevice->pci_info.function;
properties->pciDomain = pdevice->info.pci_domain;
properties->pciBus = pdevice->info.pci_bus;
properties->pciDevice = pdevice->info.pci_dev;
properties->pciFunction = pdevice->info.pci_func;
break;
}

6
src/intel/vulkan/anv_private.h
View file

@ -890,12 +890,6 @@ struct anv_physical_device {
struct anv_instance * instance;
char path[20];
struct {
uint16_t domain;
uint8_t bus;
uint8_t device;
uint8_t function;
} pci_info;
struct intel_device_info info;
/** Amount of "GPU memory" we want to advertise
*