xserver: Branch 'server-1.3-branch' - 2 commits

[Keith Packard]

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

New commits:
diff-tree 1418fd8ce4c8459775bb362ca5fed4cacf1489bf (from parents)
Merge: 5f6f8616d862ce4a37f6d3df4bdbc44fd21cc82a 9ad0811a54cb041267554c3cda03fcb1602c9ddf
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Sat Feb 17 17:37:56 2007 -0800

    Merge branch 'server-1.3-origin' into server-1.3-branch

diff-tree 5f6f8616d862ce4a37f6d3df4bdbc44fd21cc82a (from 0ab6c03c179cea58266f5fefc69931de395fcb24)
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.

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) {