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 <airl...@redhat.com>
---
hw/xfree86/common/xf86pciBus.c | 3 ++-
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 8158c2b..ab72719 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 70064ae..2486dc7 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;
--
2.5.0
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
