From 3c2d6e07bdf8daef6486b594aef0d22460eb2585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
Date: Fri, 9 Mar 2007 23:49:46 +0100
Subject: [PATCH] Don't crash when the SAREA pointer is NULL.

---
 src/i830_display.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/i830_display.c b/src/i830_display.c
index 78557126..d230f74f 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -395,6 +395,9 @@ i830PipeSetBase(xf86CrtcPtr crtc, int x, int y)
     if (pI830->directRenderingEnabled) {
 	drmI830Sarea *sPriv = (drmI830Sarea *) DRIGetSAREAPrivate(pScrn->pScreen);
 
+	if (!sPriv)
+	    return;
+
 	switch (pipe) {
 	case 0:
 	    sPriv->pipeA_x = x;
@@ -516,6 +519,9 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
 	drmI830Sarea *sPriv = (drmI830Sarea *) DRIGetSAREAPrivate(pScrn->pScreen);
 	Bool enabled = crtc->enabled && mode != DPMSModeOff;
 
+	if (!sPriv)
+	    return;
+
 	switch (pipe) {
 	case 0:
 	    sPriv->pipeA_w = enabled ? crtc->mode.HDisplay : 0;