From 7a7bb331e10498e5b8ccec58130bb23334d36562 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@neko.keithp.com>
Date: Thu, 16 Nov 2006 21:19:20 -0800
Subject: [PATCH] Don't dereference null DisplayModePtr on disabled output.

During initial configuration, outputs which are disabled have null
modes.
---
 src/i830_randr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;
     }