diff options
| author | Dave Airlie <airlied@gmail.com> | 2016-02-09 23:10:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2016-02-09 23:10:05 +1000 |
| commit | e7d972c30bf05933cfb5fa6e94ee1505f81ec2f5 (patch) | |
| tree | 3acad08078226269525c613525eab041c20d20ad | |
| parent | ed5c06f30eacc236b3e563e536bd4f440cc170d8 (diff) | |
xfree86/linux: disable using built-in pci id list on Linux.output-class-pciid
This disables the built-in pciid lists on Linux, as we want
to start using OutputClass only to pick which drivers to load.
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | hw/xfree86/common/xf86pciBus.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86platformBus.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 8158c2b62..ab72719b3 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -1424,11 +1424,12 @@ xf86PciMatchDriver(char *matches[], int nmatches) if (info) i += xf86MatchDriverFromFiles(info->vendor_id, info->device_id, matches, nmatches); -#endif +#else if ((info != NULL) && (i < nmatches)) { i += xf86VideoPtrToDriverList(info, &(matches[i]), nmatches - i); } +#endif return i; } diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index 70064aea9..2486dc7aa 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -279,11 +279,12 @@ xf86PlatformMatchDriver(char *matches[], int nmatches) if (info) j += xf86MatchDriverFromFiles(info->vendor_id, info->device_id, &matches[j], nmatches - j); -#endif +#else if ((info != NULL) && (j < nmatches)) { j += xf86VideoPtrToDriverList(info, &(matches[j]), nmatches - j); } +#endif } } return j; |