From ff1223142aedcf888665de6e4d7d5d03a55b2688 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Tue, 19 Dec 2006 12:49:55 -0800
Subject: [PATCH] Only erase curMode in i830DisableUnusedFunctions when the
 CRTC is disabled.

This bug resulted in broken xinerama, among other issues.
---
 src/i830_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i830_display.c b/src/i830_display.c
index 4899763b..88f6f163 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -987,9 +987,9 @@ i830DisableUnusedFunctions(ScrnInfoPtr pScrn)
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling CRTC %s\n",
 		       pipe_name);
 	    crtc->funcs->dpms(crtc, DPMSModeOff);
-	}
 
-	memset(&crtc->curMode, 0, sizeof(crtc->curMode));
+	    memset(&crtc->curMode, 0, sizeof(crtc->curMode));
+	}
     }
 }