xserver: Branch 'master'

[Dave Airlie]

 hw/xfree86/common/xf86VGAarbiter.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 8aeadbff0840efc0c9a073e60d6fec0dba313060
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed Sep 2 19:07:40 2009 +1000

    vgaarb: if arb init fails, make sure locking doesn't occur.
    
    pointed out by Martin Jansa on irc.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
index f8a2882..f02ccf5 100644
--- a/hw/xfree86/common/xf86VGAarbiter.c
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -93,6 +93,8 @@ xf86VGAarbiterFini(void)
 void
 xf86VGAarbiterLock(ScrnInfoPtr pScrn)
 {
+    if (vga_no_arb)
+	return;
     pci_device_vgaarb_set_target(pScrn->vgaDev);
     pci_device_vgaarb_lock();
 }
@@ -100,6 +102,8 @@ xf86VGAarbiterLock(ScrnInfoPtr pScrn)
 void
 xf86VGAarbiterUnlock(ScrnInfoPtr pScrn)
 {
+    if (vga_no_arb)
+	return;
     pci_device_vgaarb_unlock();
 }