xf86-video-intel: src/i830_driver.c

[Alan Hourihane]

 src/i830_driver.c |   10 ----------
 1 files changed, 10 deletions(-)

New commits:
diff-tree b1c2ea653502dd8547079e7014b698f241433dff (from 8a44a7acfcadbba2410dca750afc9d32bc83706e)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Tue Jul 11 08:13:30 2006 +0100

    whoops, revert some unnecessary changes

diff --git a/src/i830_driver.c b/src/i830_driver.c
index e55e421..5ce88e1 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -955,8 +955,6 @@ I830Set640x480(ScrnInfoPtr pScrn)
    if (VBESetVBEMode(pI830->pVbe, m, NULL))
 	   return TRUE;
 
-   ErrorF("Set640x480 failed1\n");
-
    /* if the first failed, let's try the next - usually 800x600 */
    m = 0x32;
    switch (pScrn->depth) {
@@ -972,8 +970,6 @@ I830Set640x480(ScrnInfoPtr pScrn)
    if (VBESetVBEMode(pI830->pVbe, m, NULL))
 	   return TRUE;
 
-   ErrorF("Set640x480 failed2\n");
-
    return FALSE;
 }
 
@@ -5576,10 +5572,6 @@ I830BIOSEnterVT(int scrnIndex, int flags
 
    pI830->leaving = FALSE;
 
-   /* Detect monitor change and switch to suitable mode */
-   if (!pI830->starting)
-      I830DetectMonitorChange(pScrn);
-
 #if 1
    /* Clear the framebuffer */
    memset(pI830->FbBase + pScrn->fbOffset, 0,
@@ -5638,11 +5630,9 @@ I830BIOSEnterVT(int scrnIndex, int flags
    ResetState(pScrn, FALSE);
    SetHWOperatingState(pScrn);
 
-#if 0
    /* Detect monitor change and switch to suitable mode */
    if (!pI830->starting)
       I830DetectMonitorChange(pScrn);
-#endif
 	    
    if (!I830VESASetMode(pScrn, pScrn->currentMode))
       return FALSE;