summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2007-02-16 10:06:22 -0800
committerKeith Packard <keithp@neko.keithp.com>2007-02-16 10:06:22 -0800
commit5f6f8616d862ce4a37f6d3df4bdbc44fd21cc82a (patch)
tree47c093f3cd0fcc5941f6ccfc3d83cf020f604775
parent0ab6c03c179cea58266f5fefc69931de395fcb24 (diff)
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.
-rw-r--r--hw/xfree86/modes/xf86Crtc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 37a3025d1..29042a0ee 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -313,7 +313,8 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
/* XXX free adjustedmode */
ret = TRUE;
- xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);
+ if (scrn->pScreen)
+ xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);
done:
if (!ret) {