diff options
| -rw-r--r-- | man/i810.man | 45 | ||||
| -rw-r--r-- | src/i830_driver.c | 7 |
2 files changed, 0 insertions, 52 deletions
diff --git a/man/i810.man b/man/i810.man index d1ee2da0..2215c7a4 100644 --- a/man/i810.man +++ b/man/i810.man @@ -129,51 +129,6 @@ other drivers. Disable or enable XVideo support. Default: XVideo is enabled for configurations where it is supported. .TP -.BI "Option \*qMonitorLayout\*q \*q" anystr \*q -Allow different monitor configurations. e.g. \*qCRT,LFP\*q will -configure a CRT on Pipe A and an LFP on Pipe B. Regardless of the -primary heads' pipe it is always configured as \*q<PIPEA>,<PIPEB>\*q. -Additionally you can add different configurations such as -\*qCRT+DFP,LFP\*q which would put a digital flat panel and a CRT -on pipe A, and a local flat panel on pipe B. -For single pipe configurations you can just specify the monitors types -on Pipe A, such as \*qCRT+DFP\*q which will enable the CRT and DFP -on Pipe A. -Valid monitors are CRT, LFP, DFP, TV, CRT2, LFP2, DFP2, TV2 and NONE. -NOTE: Some configurations of monitor types may fail, this depends on -the Video BIOS and system configuration. -Default: Not configured, and will use the current head's pipe and monitor. -.TP -.BI "Option \*qClone\*q \*q" boolean \*q -Enable Clone mode on pipe B. This will setup the second head as a complete -mirror of the monitor attached to pipe A. -NOTE: Video overlay functions will not work on the second head in this mode. -If you require this, then use the MonitorLayout above and do (as an example) -\*qCRT+DFP,NONE\*q to configure both a CRT and DFP on Pipe A to achieve -local mirroring and disable the use of this option. -Default: Clone mode on pipe B is disabled. -.TP -.BI "Option \*qCloneRefresh\*q \*q" integer \*q -When the Clone option is specified we can drive the second monitor at a -different refresh rate than the primary. -Default: 60Hz. -.TP -.BI "Option \*qCheckLid\*q \*q" boolean \*q -On mobile platforms it's desirable to monitor the lid status and switch -the outputs accordingly when the lid is opened or closed. By default this -option is on, but may incur a very minor performance penalty as we need -to poll a register on the card to check for this activity. It can be -turned off using this option. This only works with the 830M, 852GM and 855GM -systems. -Default: enabled. -.TP -.BI "Option \*qFlipPrimary\*q \*q" boolean \*q -When using a dual pipe system, it may be preferable to switch the primary -screen to the alternate pipe to display on the other monitor connection. -NOTE: Using this option may cause text mode to be restored incorrectly, -and thus should be used with caution. -Default: disabled. -.TP .BI "Option \*qRotate\*q \*q90\*q" Rotate the desktop 90 degrees counterclockwise. Other valid options are 0, 90, 180 and 270 degrees. The RandR extension is used for rotation diff --git a/src/i830_driver.c b/src/i830_driver.c index 7c365db3..cbba4373 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -270,12 +270,7 @@ typedef enum { OPTION_XVIDEO, OPTION_VIDEO_KEY, OPTION_COLOR_KEY, - OPTION_VBE_RESTORE, - OPTION_DISPLAY_INFO, - OPTION_DEVICE_PRESENCE, - OPTION_MONITOR_LAYOUT, OPTION_CHECKDEVICES, - OPTION_FIXEDPIPE, OPTION_LINEARALLOC, OPTION_INTELTEXPOOL, OPTION_INTELMMSIZE @@ -293,9 +288,7 @@ 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_MONITOR_LAYOUT, "MonitorLayout", OPTV_ANYSTR,{0}, FALSE}, {OPTION_CHECKDEVICES, "CheckDevices",OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_FIXEDPIPE, "FixedPipe", OPTV_ANYSTR, {0}, FALSE}, {OPTION_LINEARALLOC, "LinearAlloc", OPTV_INTEGER, {0}, FALSE}, {OPTION_INTELTEXPOOL,"Legacy3D", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_INTELMMSIZE, "AperTexSize", OPTV_INTEGER, {0}, FALSE}, |