xserver: Branch 'master'

[Keith Packard]

 glx/glxdri2.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit e7000534a456fdf9cd4eaada3193846c8525f740
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Oct 5 08:47:03 2013 +0100

    glx/glxdri2: Unwrap EnterVT/LeaveVT upon CloseScreen
    
    In a similar spirit to
    
    commit d75e8146c414bfd512ba5dbd4a83acb334bbe19b
    Author: Keith Packard <keithp at keithp.com>
    Date:   Mon Jul 12 16:01:34 2010 -0700
    
        Unwrap/rewrap EnterVT/LeaveVT completely, Fixes 28998
    
    we need to unwrap our pScrn->EnterVT/LeaveVT hooks around server
    regeneration or else we cause an infinite recursion on the next VT
    switch afterwards.
    
    Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1235516
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 1d74c8f..fbbd1fd 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -371,6 +371,7 @@ __glXDRIscreenDestroy(__GLXscreen * baseScreen)
 {
     int i;
 
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(baseScreen->pScreen);
     __GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen;
 
     (*screen->core->destroyScreen) (screen->driScreen);
@@ -385,6 +386,9 @@ __glXDRIscreenDestroy(__GLXscreen * baseScreen)
         free(screen->driConfigs);
     }
 
+    pScrn->EnterVT = screen->enterVT;
+    pScrn->LeaveVT = screen->leaveVT;
+
     free(screen);
 }