diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
--- xf86-video-intel-2.5.96.0/src/i830_driver.c	2008-09-25 21:32:45.000000000 +0800
+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c	2008-09-25 21:34:19.000000000 +0800
@@ -912,6 +912,7 @@
    if (IS_MOBILE(pI830) && !IS_I830(pI830))
       i830_lvds_init(pScrn);
 
+#if 0
    if (IS_I9XX(pI830)) {
       if (INREG(SDVOB) & SDVO_DETECTED) {
 	 Bool found = i830_sdvo_init(pScrn, SDVOB);
@@ -931,7 +932,8 @@
    }
    if (IS_I9XX(pI830) && IS_MOBILE(pI830))
       i830_tv_init(pScrn);
-   
+#endif
+
    for (o = 0; o < config->num_output; o++)
    {
       xf86OutputPtr	   output = config->output[o];
@@ -1612,7 +1614,9 @@
 	PreInitCleanup(pScrn);
 	return FALSE;
     }
+#if 0
     RestoreHWState(pScrn);
+#endif
 
     /* XXX This should go away, replaced by xf86Crtc.c support for it */
     pI830->rotation = RR_Rotate_0;