xserver: Branch 'master'

[Keith Packard]

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

New commits:
diff-tree 5631a67f648f5f151a849a918ee12871c71c32e9 (from 096965ec9c7514f0c9fc0d17e5166f2d26781f87)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Fri Feb 16 10:06:22 2007 -0800

    Don't set subpixel order during startup; the screen won't be ready.
    
    in xf86CrtcSetMode, scrn->pScreen will be NULL during server startup time,
    so don't try to set the subpixel order. subpixel order will be set in the
    randr initialization anyways.
    (cherry picked from commit 5f6f8616d862ce4a37f6d3df4bdbc44fd21cc82a)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 37a3025..29042a0 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -313,7 +313,8 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, Displ
 
     /* XXX free adjustedmode */
     ret = TRUE;
-    xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);
+    if (scrn->pScreen)
+	xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);
 
 done:
     if (!ret) {