[PATCH] xfree86: use vgaarb only if X configures more than one card

[Tiago Vignatti]

X server still doesn't have support for video card hotplug. Therefore, if
the kernel returns more than one device but the X claims only one, then
give priority for what X is telling.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 hw/xfree86/common/xf86Bus.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index e0d9804..008650c 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -529,12 +529,12 @@ xf86PostScreenInit(void)
     }
 
     /*
-     * we need to wrap the arbiter if we have more than
+     * we need to wrap the arbiter if the server configures more than
      * one VGA card - hotplug cries.
      */
 #ifdef HAVE_PCI_DEVICE_VGAARB_INIT
     pci_device_vgaarb_get_info(NULL, &vga_count, NULL);
-    if (vga_count > 1 && xf86Screens) {
+    if (vga_count > 1 && xf86NumScreens > 1) {
 	xf86Msg(X_INFO,"Number of VGA devices: %d: arbiter wrapping enabled\n", vga_count);
         for (i = 0; i < xf86NumScreens; i++)
 	    xf86VGAarbiterWrapFunctions(xf86Screens[i]->pScreen);
-- 
1.5.6.3