xf86-video-intel: Branch 'modesetting' - src/i830_randr.c

[Keith Packard]

 src/i830_randr.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 7a7bb331e10498e5b8ccec58130bb23334d36562 (from c4508c1cadf323e9ef1d0e69dd77d5e841a6a978)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Thu Nov 16 21:19:20 2006 -0800

    Don't dereference null DisplayModePtr on disabled output.
    
    During initial configuration, outputs which are disabled have null
    modes.

diff --git a/src/i830_randr.c b/src/i830_randr.c
index e01ac1e..d27125f 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;
     }