summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2006-11-16 21:19:20 -0800
committerKeith Packard <keithp@neko.keithp.com>2006-11-16 21:19:20 -0800
commit7a7bb331e10498e5b8ccec58130bb23334d36562 (patch)
tree911c1683eeee958db03ea84c7b31b8b7cd5cf3c3 /src
parentc4508c1cadf323e9ef1d0e69dd77d5e841a6a978 (diff)
Don't dereference null DisplayModePtr on disabled output.
During initial configuration, outputs which are disabled have null modes.
Diffstat (limited to 'src')
-rw-r--r--src/i830_randr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i830_randr.c b/src/i830_randr.c
index e01ac1e1..d27125f4 100644
--- a/src/i830_randr.c
+++ b/src/i830_randr.c
@@ -1266,7 +1266,8 @@ I830RandRPreInit (ScrnInfoPtr pScrn)
pipe = 0;
enabled = FALSE;
}
- pI830->pipes[pipe].desiredMode = *mode;
+ if (mode)
+ pI830->pipes[pipe].desiredMode = *mode;
pI830->output[o].pipe = pipe;
pI830->output[o].enabled = enabled;
}