diff options
| -rw-r--r-- | man/i810.man | 7 | ||||
| -rw-r--r-- | src/i830.h | 1 | ||||
| -rw-r--r-- | src/i830_driver.c | 11 |
3 files changed, 0 insertions, 19 deletions
diff --git a/man/i810.man b/man/i810.man index f6b73689..3aaa165b 100644 --- a/man/i810.man +++ b/man/i810.man @@ -117,13 +117,6 @@ The following driver .B Options are supported for the 830M and later chipsets: .TP -.BI "Option \*qVBERestore\*q \*q" boolean \*q -Enable or disable the use of VBE save/restore for saving and restoring -the initial text mode. This is disabled by default because it causes -lockups on some platforms. However, there are some cases where it must -enabled for the correct restoration of the initial video mode. If you are -having a problem with that, try enabling this option. Default: Disabled. -.TP .BI "Option \*qVideoKey\*q \*q" integer \*q This is the same as the .B \*qColorKey\*q @@ -416,7 +416,6 @@ typedef struct _I830Rec { int yoffset; unsigned int SaveGeneration; - Bool vbeRestoreWorkaround; Bool devicePresence; OsTimerPtr devicesTimer; diff --git a/src/i830_driver.c b/src/i830_driver.c index 6000300a..5e0cff6e 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -260,7 +260,6 @@ static OptionInfoRec I830Options[] = { {OPTION_XVIDEO, "XVideo", OPTV_BOOLEAN, {0}, TRUE}, {OPTION_COLOR_KEY, "ColorKey", OPTV_INTEGER, {0}, FALSE}, {OPTION_VIDEO_KEY, "VideoKey", OPTV_INTEGER, {0}, FALSE}, - {OPTION_VBE_RESTORE, "VBERestore", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_DEVICE_PRESENCE,"DevicePresence",OPTV_BOOLEAN,{0}, FALSE}, {OPTION_MONITOR_LAYOUT, "MonitorLayout", OPTV_ANYSTR,{0}, FALSE}, {OPTION_CLONE, "Clone", OPTV_BOOLEAN, {0}, FALSE}, @@ -2426,16 +2425,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) pI830->pVbe = NULL; #endif - /* Use the VBE mode restore workaround by default. */ - pI830->vbeRestoreWorkaround = TRUE; - from = X_DEFAULT; - if (xf86ReturnOptValBool(pI830->Options, OPTION_VBE_RESTORE, FALSE)) { - pI830->vbeRestoreWorkaround = FALSE; - from = X_CONFIG; - } - xf86DrvMsg(pScrn->scrnIndex, from, "VBE Restore workaround: %s.\n", - pI830->vbeRestoreWorkaround ? "enabled" : "disabled"); - #if defined(XF86DRI) /* Load the dri module if requested. */ if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) && |