summaryrefslogtreecommitdiff
path: root/src/i830_driver.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2006-07-11 08:13:30 +0100
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2006-07-11 08:13:30 +0100
commitb1c2ea653502dd8547079e7014b698f241433dff (patch)
tree40c00f72772fdaf82622e962251f29da998c8818 /src/i830_driver.c
parent8a44a7acfcadbba2410dca750afc9d32bc83706e (diff)
whoops, revert some unnecessary changes
Diffstat (limited to 'src/i830_driver.c')
-rw-r--r--src/i830_driver.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index e55e421d..5ce88e14 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;