xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/modes/xf86Crtc.c |    1 -
 1 files changed, 1 deletion(-)

New commits:
diff-tree a39f297ada4fa87c858395ae2aacefac5f8fba05 (from 11797ffdcc22160317a5ebbc9291472570a51c6d)
Author: Keith Packard <keithp at viola.jf.intel.com>
Date:   Mon Apr 2 14:15:36 2007 -0700

    Don't erase current crtc for outputs on CloseScreen
    
    Erasing this variable causes some outputs (SDVO on intel) to fail
    to be correctly reset at server reset time.
    (cherry picked from commit 56262a4ee943f328d089a8eb4aa70b9a4bd5d135)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 32bdcba..0fe03d3 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -598,7 +598,6 @@ xf86CrtcCloseScreen (int index, ScreenPt
     {
 	xf86OutputPtr	output = config->output[o];
 
-	output->crtc = NULL;
 	output->randr_output = NULL;
     }
     for (c = 0; c < config->num_crtc; c++)