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

Silence the "No matching Device section" warning in some harmless cases. 

If the device doesn't have any BARs then it's just a stub for some
lame operating systems that need one PCI device per output for
multihead.  No point in warning about it.
This commit is contained in:
Adam Jackson 2008-08-01 13:17:55 -04:00
parent 9643e8d348
commit 82d51e6df2
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/xfree86/common/xf86Helper.c
View File

@ -1550,6 +1550,21 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
return i; return i;
} }
static Bool
pciDeviceHasBars(struct pci_device *pci)
{
int i;
for (i = 0; i < 6; i++)
if (pci->regions[0].size)
return TRUE;
if (pci->rom_size)
return TRUE;
return FALSE;
}
struct Inst { struct Inst {
struct pci_device * pci; struct pci_device * pci;
GDevPtr dev; GDevPtr dev;
@ -1804,7 +1819,7 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
} }
if (devBus) dev = devBus; /* busID preferred */ if (devBus) dev = devBus; /* busID preferred */
if (!dev) { if (!dev) {
if ( xf86CheckPciSlot( pPci ) ) { if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) {
xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section " xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
"for instance (BusID PCI:%u@%u:%u:%u) found\n", "for instance (BusID PCI:%u@%u:%u:%u) found\n",
driverName, pPci->domain, pPci->bus, pPci->dev, driverName, pPci->domain, pPci->bus, pPci->dev,