diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-20 08:18:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-20 08:18:11 +0200 |
| commit | 06d4ea68085558b94d8e9c937091e7b7fcc5d95a (patch) | |
| tree | 01ff2f6a8d6ae430a526282d98eede21c7cfffd0 /xorg-server/hw/xfree86/common/xf86platformBus.c | |
| parent | 52213f2cd11c6cc7210cea6896ed464fddfe3fec (diff) | |
| download | vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.tar.gz vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.tar.bz2 vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.zip | |
libxcb xserver pixman mesa git update 20 sep 2012
libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea
xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345
pixman: 3124a51abb89475b8c5045bc96e04c5852694a16
mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86platformBus.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86platformBus.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86platformBus.c b/xorg-server/hw/xfree86/common/xf86platformBus.c index 24b947326..0525e39bc 100644 --- a/xorg-server/hw/xfree86/common/xf86platformBus.c +++ b/xorg-server/hw/xfree86/common/xf86platformBus.c @@ -213,11 +213,12 @@ xf86platformProbe(void) int i; Bool pci = TRUE; + config_odev_probe(xf86PlatformDeviceProbe); + if (!xf86scanpci()) { pci = FALSE; } - config_odev_probe(&xf86PlatformDeviceProbe); for (i = 0; i < xf86_num_platform_devices; i++) { char *busid = xf86_get_platform_attrib(i, ODEV_ATTRIB_BUSID); @@ -358,6 +359,9 @@ xf86platformProbeDev(DriverPtr drvp) break; } else { + /* for non-seat0 servers assume first device is the master */ + if (ServerIsNotSeat0()) + break; if (xf86_platform_devices[j].pdev) { if (xf86IsPrimaryPlatform(&xf86_platform_devices[j])) break; |