frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: xf86platformProbe: split finding pci-info and setting primary GPU 

This is a preparation patch for allowing an OutputClass section to
override the default primary GPU device selection.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans De Goede 2016-12-12 17:03:15 +01:00 committed by Adam Jackson
parent 9cd3cc7526
commit ab1a65b775
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/xfree86/common/xf86platformBus.c
View File

@ -145,16 +145,9 @@ platform_find_pci_info(struct xf86_platform_device *pd, char *busid)
iter = pci_slot_match_iterator_create(&devmatch); iter = pci_slot_match_iterator_create(&devmatch);
info = pci_device_next(iter); info = pci_device_next(iter);
if (info) { if (info)
pd->pdev = info; pd->pdev = info;
pci_device_probe(info);
if (pci_device_is_boot_vga(info)) {
primaryBus.type = BUS_PLATFORM;
primaryBus.id.plat = pd;
}
}
pci_iterator_destroy(iter); pci_iterator_destroy(iter);
} }
static Bool static Bool
@ -307,6 +300,20 @@ xf86platformProbe(void)
platform_find_pci_info(&xf86_platform_devices[i], busid); platform_find_pci_info(&xf86_platform_devices[i], busid);
} }
} }
for (i = 0; i < xf86_num_platform_devices; i++) {
struct xf86_platform_device *dev = &xf86_platform_devices[i];
if (!dev->pdev)
continue;
pci_device_probe(dev->pdev);
if (pci_device_is_boot_vga(dev->pdev)) {
primaryBus.type = BUS_PLATFORM;
primaryBus.id.plat = dev;
}
}
return 0; return 0;
} }