xserver: Branch 'server-1.7-nominations'

[Peter Hutterer]

 hw/xfree86/common/xf86Init.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8c0548bc34dead67bc944a59664be6254be928bd
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Thu Apr 1 18:57:50 2010 +0300

    xfree86: die gracefully in the vga arbiter if AddScreen fails
    
    vga arbiter will be locked in one device while AbortDDX will call LeaveVT
    routines from the other device. Fail!
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit b9ad452ec92a7dcbed680acb3f3b8ec29fa660df)
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index d3de670..09741d7 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1245,7 +1245,9 @@ AbortDDX(void)
 	       * we might not have been wrapped yet. Therefore enable
 	       * screen explicitely.
 	       */
+	      xf86VGAarbiterLock(xf86Screens[i]);
 	      (xf86Screens[i]->LeaveVT)(i, 0);
+	      xf86VGAarbiterUnlock(xf86Screens[i]);
 	  }
   }