diff -p -up xf86-video-intel-2.4.2/src/i830_driver.c.restoreHW xf86-video-intel-2.4.2/src/i830_driver.c --- xf86-video-intel-2.4.2/src/i830_driver.c.restoreHW 2008-10-13 17:41:35.000000000 +0200 +++ xf86-video-intel-2.4.2/src/i830_driver.c 2008-10-13 17:41:41.000000000 +0200 @@ -925,6 +925,7 @@ I830SetupOutputs(ScrnInfoPtr pScrn) 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); @@ -944,7 +945,8 @@ I830SetupOutputs(ScrnInfoPtr pScrn) } 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]; @@ -1658,7 +1660,9 @@ I830PreInit(ScrnInfoPtr pScrn, int flags 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;