RADEON: remove mergedfb, etc. cruft from man page

2 files changed, 0 insertions, 228 deletions

diff --git a/man/radeon.man b/man/radeon.man
index 447dcbee..fcb6d736 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -223,227 +223,6 @@ HIGH   \-\- Force to the highest priority.
 The default value is
 .B AUTO.
 .TP
-.BI "Option \*qMonitorLayout\*q \*q" string \*q
-.br
-This option is used to overwrite the detected monitor types.
-This is only required when driver makes a false detection.
-The possible monitor types are:
-.br
-NONE   \-\- Not connected
-.br
-CRT    \-\- Analog CRT monitor
-.br
-TMDS   \-\- Desktop flat panel
-.br 
-LVDS   \-\- Laptop flat panel
-.br
-This option can be used in following format:
-.br
-Option "MonitorLayout" "[type on primary], [type on secondary]"
-.br
-For example, Option "MonitorLayout" "CRT, TMDS"
-
-Primary/Secondary head for dual\-head cards:
-.br
-(when only one port is used, it will be treated as the primary regardless)
-.br
-.B Primary head:
-.br
-DVI port on DVI+VGA cards
-.br
-LCD output on laptops
-.br 
-Internal TMDS port on DVI+DVI cards
-.br 
-.B Secondary head:
-.br
-VGA port on DVI+VGA cards
-.br
-VGA port on laptops
-.br
-External TMDS port on DVI+DVI cards
-
-The default value is
-.B undefined.
-.TP 
-.BI "Option \*qMergedFB\*q \*q" boolean \*q
-This enables merged framebuffer mode.  In this mode you have a single 
-shared framebuffer with two viewports looking into it.  It is similar
-to Xinerama, but has some advantages.  It is faster than Xinerama, the
-DRI works on both heads, and it supports clone modes.  
-.br
-Merged framebuffer mode provides two linked viewports looking into a
-single large shared framebuffer.  The size of the framebuffer is 
-determined by the
-.B Virtual
-keyword defined on the
-.B Screen
-section of your __xconfigfile__ file.  It works just like regular virtual
-desktop except you have two viewports looking into it instead of one.
-.br
-For example, if you wanted a desktop composed of two 1024x768 viewports
-looking into a single desktop you would create a virtual desktop of 
-2048x768 (left/right) or 1024x1536 (above/below), e.g.,
-.br
-.B Virtual 2048 768
-or
-.B Virtual 1024 1536
-.br
-The virtual desktop can be larger than larger than the size of the viewports
-looking into it.  In this case the linked viewports will scroll around in the 
-virtual desktop.  Viewports with different sizes are also supported (e.g., one
-that is 1024x768 and one that is 640x480).  In this case the smaller viewport
-will scroll relative to the larger one such that none of the virtual desktop 
-is inaccessible.  If you do not define a virtual desktop the driver will create
-one based on the orientation of the heads and size of the largest defined mode in 
-the display section that is supported on each head.
-.br
-The relation of the viewports in specified by the
-.B CRT2Position
-Option.  The options are
-.B Clone
-,
-.B LeftOf
-,
-.B RightOf
-,
-.B Above
-, and
-.B Below.  
-MergedFB is enabled by default if a monitor is detected on each output.  If 
-no position is given it defaults to clone mode (the old clone options are now 
-deprecated, also, the option OverlayOnCRTC2 has been replaced by the Xv 
-attribute XV_SWITCHCRT; the overlay can be switched to CRT1 or CRT2 on the fly 
-in clone mode).
-.br
-The maximum framebuffer size that the 2D acceleration engine can handle is 
-8192x8192.  The maximum framebuffer size that the 3D engine can handle is 
-2048x2048.
-.br
-.B Note:
-Page flipping does not work well in certain configurations with MergedFB.  If you 
-see rendering errors or other strange behavior, disable page flipping. Also MergedFB
-is not compatible with the 
-.B UseFBDev 
-option.
-.br
-The default value is
-.B undefined.
-.TP 
-.BI "Option \*qCRT2HSync\*q \*q" "string" \*q
-Set the horizontal sync range for the secondary  monitor. 
-It is not required if a DDC\-capable monitor is connected.
-.br
-For example, Option "CRT2HSync" "30.0-86.0"
-.br
-The default value is
-.B undefined.
-.TP 
-.BI "Option \*qCRT2VRefresh\*q \*q" "string" \*q
-Set the vertical refresh range for the secondary monitor.
-It is not required if a DDC\-capable monitor is connected.
-.br
-For example, Option "CRT2VRefresh" "50.0-120.0"
-.br
-The default value is
-.B undefined.
-.TP
-.BI "Option \*qCRT2Position\*q \*q" "string" \*q
-Set the relationship of CRT2 relative to CRT1. Valid options are: 
-.B Clone
-,
-.B LeftOf
-,
-.B RightOf
-,
-.B Above
-, and
-.B Below
-.
-.br
-For example, Option "CRT2Position" "RightOf"
-.br
-This option also supports an offset.  This is most useful when
-.B MergedNonRectangular 
-is enabled.  For example if you want CRT2 to be offset 100 pixels down from 
-the start of CRT1, you'd type:
-.br
-Option "CRT2Position" "LeftOf 100"
-.br
-The offset is vertical for LeftOf and RightOf and horizontal for Above and 
-Below.  Offsets can be positive or negative.
-.br
-The default value is
-.B Clone.
-.TP
-.BI "Option \*qMetaModes\*q \*q" "string" \*q
-MetaModes are mode combinations for CRT1 and CRT2.  If you are using merged
-frame buffer mode and want to change modes (CTRL-ALT-+/-), these define which
-modes will be switched to on CRT1 and CRT2.  The MetaModes are defined as 
-CRT1Mode-CRT2Mode (800x600-1024x768).  Modes listed individually (800x600) 
-define clone modes, that way you can mix clone modes with non-clone modes. 
-Also some programs require "standard" modes.  If you want to add clone modes 
-of different refreshes or sizes to the mix, they are defined as CRT1Mode+CRT2Mode 
-(800x600+1024x768).
-.br
-Note:  Any mode you use in the MetaModes must be defined in the
-.B Screen 
-section of your __xconfigfile__ file.  Modes not defined there will be ignored when
-the MetaModes are parsed since the driver uses them to make sure the monitors can 
-handle those modes.  If you do not define a MetaMode the driver will create
-one based on the orientation of the heads and size of the largest defined mode in 
-the display section that is supported on each head.
-.br
-.B Modes "1024x768" "800x600" "640x480"
-.br
-For example, Option "MetaModes" "1024x768-1024x768 800x600-1024x768 640x480-800x600 800x600"
-.br
-The default value is
-.B undefined.
-.TP
-.BI "Option \*qMergedXinerama\*q \*q" boolean \*q
-Since merged framebuffer mode does not use Xinerama, apps are not able to intelligently
-place windows.  Merged framebuffer mode provides its own pseudo-Xinerama.  This allows
-Xinerama compliant applications to place windows appropriately.  There are some caveats.
-Since merged framebuffer mode is able to change relative screen sizes and orientations on
-the fly, as well has having overlapping viewports, pseudo-Xinerama, might not always 
-provide the right hints.  Also many Xinerama compliant applications only query Xinerama
-once at startup; if the information changes, they may not be aware of the change.  If
-you are already using Xinerama (e.g., a single head card and a dualhead card providing
-three heads), pseudo-Xinerama will be disabled.
-.br
-This option allows you turn off the driver provided pseudo-Xinerama extension.
-.br
-The default value is
-.B TRUE.
-.TP 
-.BI "Option \*qMergedXineramaCRT2IsScreen0\*q \*q" boolean \*q
-By default the pseudo-Xinerama provided by the driver makes the left-most or bottom
-head Xinerama screen 0.  Certain Xinerama-aware applications do special things with 
-screen 0.  To change that behavior, use this option.
-.br
-The default value is
-.B undefined.
-.TP
-.BI "Option \*qMergedDPI\*q \*q" "string" \*q
-The driver will attempt to figure out an appropriate DPI based on the DDC information
-and the orientation of the heads when in merged framebuffer mode.  If this value does 
-not suit you, you can manually set the DPI using this option.
-.br
-For example, Option "MergedDPI" "100 100"
-.br
-The default value is
-.B undefined.
-.TP
-.BI "Option \*qMergedNonRectangular\*q \*q" boolean \*q
-If you are using MergedFB with two modes of different sizes, turn this option on to 
-keep the smaller head from scrolling within the larger virtual desktop and to keep 
-the mouse from moving into that area.  Applications that are not Xinerama aware can 
-potentially end up stranded in this area.
-.br
-The default value is
-.B FALSE.
-.TP
 .BI "Option \*qColorTiling\*q \*q" "boolean" \*q
 Frame buffer can be addressed either in linear or tiled mode. Tiled mode can provide
 significant performance benefits with 3D applications, for 2D it shouldn't matter
@@ -478,12 +257,6 @@ For example, Option "PanelSize" "1400x1050"
 .br
 The default value is
 .B none.
-.TP 
-.BI "Option \*qPanelOff\*q \*q" boolean \*q
-Disable panel output.
-.br
-The default value is
-.B off.
 .TP
 .BI "Option \*qEnablePageFlip\*q \*q" boolean \*q
 Enable page flipping for 3D acceleration. This will increase performance
diff --git a/src/radeon.h b/src/radeon.h
index f8d9c65a..7922f1a2 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -117,7 +117,6 @@ typedef enum {
     OPTION_ACCEL_DFS,
 #endif
 #endif
-    OPTION_PANEL_OFF,
     OPTION_DDC_MODE,
     OPTION_IGNORE_EDID,
     OPTION_FBDEV,