? diff
? diff2
? diff3
Index: i830_driver.c
===================================================================
RCS file: /cvs/xorg/driver/xf86-video-i810/src/i830_driver.c,v
retrieving revision 1.36
diff -u -r1.36 i830_driver.c
--- i830_driver.c	3 Oct 2005 09:39:17 -0000	1.36
+++ i830_driver.c	10 Jan 2006 23:09:49 -0000
@@ -3334,10 +3334,12 @@
       xf86LoaderReqSymLists(I810shadowFBSymbols, NULL);
    }
 
+#if 0
    VBEFreeVBEInfo(pI830->vbeInfo);
    pI830->vbeInfo = NULL;
    vbeFree(pI830->pVbe);
    pI830->pVbe = NULL;
+#endif
 
    /* Use the VBE mode restore workaround by default. */
    pI830->vbeRestoreWorkaround = TRUE;
@@ -4524,6 +4526,7 @@
     * If we're changing the BIOS's view of the video memory size, do that
     * first, then re-initialise the VBE information.
     */
+   SetPipeAccess(pScrn);
    if (pI830->pVbe)
       vbeFree(pI830->pVbe);
    pI830->pVbe = VBEInit(NULL, pI830->pEnt->index);