xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/modes/xf86Crtc.c |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 5a51cb86f39a6809305c403beea54c3625e36259
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Jul 10 23:09:47 2012 -0700

    xfree86: When xf86CrtcCloseScreen is called, the randr CRTCs are gone
    
    The RandR CRTC structures are freed when their resource IDs are
    destroyed during server shut down, which is before the screen is
    closed. Calling back into RandR with stale pointers just segfaults the
    server.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Dave Airlie <airlied at redhat.com>
    Tested-by: Knut Petersen <knut_petersen at t-online.de>

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index dfce1d1..154f684 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -734,9 +734,6 @@ xf86CrtcCloseScreen(ScreenPtr screen)
     for (c = 0; c < config->num_crtc; c++) {
         xf86CrtcPtr crtc = config->crtc[c];
 
-        if (crtc->randr_crtc->scanout_pixmap)
-            RRCrtcDetachScanoutPixmap(crtc->randr_crtc);
-
         crtc->randr_crtc = NULL;
     }
     /* detach any providers */