From 6b4aa8a359822cc70666de3b18744f05dd9b5f45 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 12 Dec 2012 12:56:46 +1000 Subject: [PATCH] Revert "xf86: Fix non-PCI configuration-less setups" This reverts commit 76d9c62eb2be2010a19bf36285012d086cdd180b. This breaks multi-GPU setups here, so lets drop it for now. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86platformBus.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index 599d84ac2..0525e39bc 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -377,14 +377,6 @@ xf86platformProbeDev(DriverPtr drvp) continue; } - /* - * If all of the above fails, which can happen if X was started without - * configuration or if BusID wasn't set for non-PCI devices, use the first - * device by default. - */ - if (!foundScreen && xf86_num_platform_devices > 0 && numDevs > 0) - foundScreen = probeSingleDevice(&xf86_platform_devices[0], drvp, devList[0], 0); - /* if autoaddgpu devices is enabled then go find a few more and add them as GPU screens */ if (xf86Info.autoAddGPU && numDevs) { for (j = 0; j < xf86_num_platform_devices; j++) {