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

[Eric Anholt]

 src/i830_display.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree ff1223142aedcf888665de6e4d7d5d03a55b2688 (from 3b5703c7fa08e63f2a31be7496ded9c70015946d)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 19 12:49:55 2006 -0800

    Only erase curMode in i830DisableUnusedFunctions when the CRTC is disabled.
    
    This bug resulted in broken xinerama, among other issues.

diff --git a/src/i830_display.c b/src/i830_display.c
index 4899763..88f6f16 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -987,9 +987,9 @@ i830DisableUnusedFunctions(ScrnInfoPtr p
 	    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));
+	}
     }
 }