summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Crouse <jordan.crouse@amd.com>2007-05-09 17:17:25 -0600
committerJordan Crouse <jordan.crouse@amd.com>2007-05-10 10:24:47 -0600
commit022a106b38693d2d705e8c15ad84c18832fa2e8c (patch)
tree54e8ee9ebdb39200680af602048f9fbc749e1489
parent37719011a020eafc9a6848025f3e07219c2f5444 (diff)
Documentation cleanups
Rework the readme, and delete the now woefully out of date man pages. Also update the TODO file with more interesting information.
-rw-r--r--ChangeLog0
-rw-r--r--Makefile.am2
-rw-r--r--README897
-rw-r--r--TODO36
-rw-r--r--man/Makefile.am59
-rw-r--r--man/amd.man417
-rw-r--r--src/amd.4.html439
-rw-r--r--src/cim/cim_defs.h.rej45
8 files changed, 50 insertions, 1845 deletions
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/ChangeLog
+++ /dev/null
diff --git a/Makefile.am b/Makefile.am
index 7052905..16f4412 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,4 +19,4 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src man
+SUBDIRS = src
diff --git a/README b/README
index 22cc517..b1932f0 100644
--- a/README
+++ b/README
@@ -1,878 +1,51 @@
-AMD Geode(TM) LX/GX Processor Xorg Display Driver - Release Notes
-Version 04.00.00-01
-June 18, 2006
+AMD Geode GX and LX Xorg graphics Driver
+May 9, 2007
+========================================
---------------------------------------------------------------------------------
-PRODUCT INFORMATION
---------------------------------------------------------------------------------
-- This driver is the Xorg Display Driver for the AMD Geode(TM) Geode LX and
- GX processors
+= Introduction =
-This product is avaiable as a standalone patch comprising:
- Graphics_LinuxXorg_Common_03.00.0101.patch
- README.txt (this file)
+This is the X graphics driver for the AMD Geode GX and LX processors.
+The GX driver features XAA and EXA support for graphics acceleration,
+and the LX driver supports EXA (including compositing). Both drivers
+suppport dynamic rotation with XRandR, and Xv overlay support.
-or as a tarball Graphics_LinuxXorg_Common_03.00.0101.tar.gz containing:
- Graphics_LinuxXorg_Common_03.00.0101.patch
- xorg.conf_lx
- xorg.conf_gx
- README.txt (this file)
+= Configuration options =
-The patch adds the following documenation to the Xorg tree:
-xc/programs/Xserver/hw/xfree86/drivers/amd/amd.man
-xc/programs/Xserver/hw/xfree86/drivers/amd/gfx/release.txt (GX only)
-xc/programs/Xserver/hw/xfree86/drivers/amd/panel/readme.txt (GX only)
+You can specify the AMD driver in the normal fashion:
-The following example files are provided in the tarball release only
- xorg.conf_lx
- xorg.conf_gx
-
-For bugs, patches, and info requests, please subscribe to:
-info-linux@geode.amd.com
-
-To subscribe, send a blank message to: info-linux-subscribe@geode.amd.com
-
-Features
---------
-The AMD Geode Linux Xorg driver implements Xorg XAA driver interface.
-Through a hardware abstraction layer called Durango (GX) and Cimarron (LX),
-the full accelerated functionality of the graphics processor is exposed to
-the driver.
-
-The AMD Geode Xorg driver implements:
-
- - Xv video overlay extension support
- - Geode hardware color-space conversion
- - V4L2 overlay functionality (Geode LX processor only)
- - Rotated graphical output
- - DDC support
- - DPMS support
- - Common X.org patch support both Geode LX and GX processors
-
-Dependencies
-------------
-This release depends on and includes the following subcomponents:
-
-Linux Build Tool - Base GeodeLinux Build System - Version 00.00.0021
-Linux Build Tool - AMD Embedded - Version 00.00.0022
-Linux Build Tool - Bitbake engine - Version 00.00.0011
-Linux Build Tool - Openembedded - Version 00.00.0008
-
-
-Functional Changes
-------------------
-_____________________________________________________________________________
-Change: 78946
-_____________________________________________________________________________
-Add multiple BUILDCONFIG functionality to Tinderbox glue.
-
-_____________________________________________________________________________
-Change: 79682
-_____________________________________________________________________________
-Initial add of LinuxBIOSv2 source tree to Perforce. This code base matches
-upstream SVN version 2296. Add P4MOD BOMs and Tinderbox configuration/linuxbios-
-devel GeodeLinux targets.
-
-_____________________________________________________________________________
-Change: 81342
-_____________________________________________________________________________
-mplayer: enable qtx, opengl, libdvd, and alsa. xorg: enable Xft and Xinerama
-icewm: configure and .bb patches for identifying correct X includes/libs
-
-_____________________________________________________________________________
-Change: 80914
-_____________________________________________________________________________
-Add a klocwork DISTRO and some task-*-klocwork meta files to define the
-projects to build for klocwork. Move KWBUILD to the configuration file. Add
-some klocwork report generation to klocwork.bbclass.
-
-_____________________________________________________________________________
-Change: 80794
-_____________________________________________________________________________
-klocwork.bbclass updates to support client/host and build renaming. Add a
-draft nightly build script for klocwork builds. Only those .bb files with
-KWBUILD=1 will be built here. Add COMPATIBLE_HOST for geode .bb files.
-virtual/geode-aes must point to linux-geodelx with 2.6.16 now that this
-is integrated. recent gcc-sdk-native changes were resulting in empty
-packages. Revert and disable task-compilers from validation-image for
-swval until this can be repaired.
-
-_____________________________________________________________________________
-Change: 79683
-_____________________________________________________________________________
-Release and devel .bb files for linuxbios pass build on morlock.
-
-_____________________________________________________________________________
-Change: 81340
-_____________________________________________________________________________
-Add libxinerama to xorg 6.8.1 config for icewm. xscreensaver depends upon intltool-
-native. Use '/usr/bin/env perl' as intltool-* interpreter.
-
-_____________________________________________________________________________
-Change: 81186
-_____________________________________________________________________________
-Add geodelx-6.8.1 machine for norwich validation on 2.6.16+xorg6.8.1. Leave
-geodelx machine at X11R7.0 because upgrade to X11R7.1 is imminent. Move x11
-clients from validation-image to task-xorg because the packages differ
-between 6.8.1 and 7.0. Add p4 binaries to validation-image. Add icewm to
-validation-image.
-
-_____________________________________________________________________________
-Change: 80319
-_____________________________________________________________________________
-* Cleanup X11R6.8.1 PROVIDERS for 'gentoo' builds.
- * Created a new .bb file to correctly handle the 'gentoo'->other
- branch of validationtests.
- * ztv for 2.4.24 depends upon libxv as well
- * Add 'Kernel Build Directory' to /etc/openembedded/version for gcov
- builds so that GCOV_PREFIX environment variables may be used
- effectively.
- * disable ica-bin download error in amd/packages/ica because we have
- this downloaded to the internal mirror morlock.
-
-_____________________________________________________________________________
-Change: 80637
-_____________________________________________________________________________
-add project/geodelx/unittest/ and configuration files
-
-_____________________________________________________________________________
-Change: 80373
-_____________________________________________________________________________
-libxft and libxrandr PROVIDERS for geodelx and dimsum are X11R7.0. configure
-proxy variables in environment rather than command line for LSF builds.
-
-_____________________________________________________________________________
-Change: 79322
-_____________________________________________________________________________
-dimsum cleanup.
-
-_____________________________________________________________________________
-Change: 80630
-_____________________________________________________________________________
-Disable CCACHE for gcov builds so gcda files go to the correct location.
-
-_____________________________________________________________________________
-Change: 80370
-_____________________________________________________________________________
-Merge with OE snapshot from 2006/06/02:
-http://eloi.amd.com/openembedded/oe/oe_20060602030001.tgz
-
-and Bitbake version 1.4.2: http://eloi.amd.com/openembedded/bitbake/bitbake-
-1.4.2.tar.gz
-
-_____________________________________________________________________________
-Change: 80969
-_____________________________________________________________________________
-Propegate 80912 to local.rules for other images. Add x11perf, xclock, xvinfo,
-rdesktop, and xpandmodes to validation-image. Add xvtest to amdtools RDEPENDS
-so that it makes it to the image.
-
-_____________________________________________________________________________
-Change: 78809
-_____________________________________________________________________________
-Update task-compilers. This appears to build the 2.6.16 kernel OK (save
-storage requirements for object files). Im adding this to the validation-
-image for a quick build on LSF. Next, I will make this an optional package.
-
-_____________________________________________________________________________
-Change: 79843
-_____________________________________________________________________________
-Merge //drivers/buildroot/geodelinux/...@79818 and
-//depot/tools/buildroot/geodelinux/...@51650.
-
-_____________________________________________________________________________
-Change: 79588
-_____________________________________________________________________________
-Merge //drivers/buildroot/geodelinux/...@79560 and
-//depot/tools/buildroot/geodelinux/...@51580
-
-_____________________________________________________________________________
-Change: 81291
-_____________________________________________________________________________
-Add serf for 2.6.11 to OE and Gentoo.
-
-_____________________________________________________________________________
-Change: 81312
-_____________________________________________________________________________
-intltool-native perl script use #/usr/bin/env perl interpreter. more validation-
-tests postinst updates. Update PREFERRED_PROVIDERS for devel targets to
-geode-v4l2lx-devel. Leave release at linux-geodelx until we have a release
-to replace it with.
-
-_____________________________________________________________________________
-Change: 79362
-_____________________________________________________________________________
-PBz#8158: Add /etc/modules.autoload.d/kernel-2.6 file including lxv4l2 to
-2.6.11, 2.6.15, and 2.6.16 Gentoo kernel builds. Add lxv4l2 to autoload list
-for processing by kernel.bbclass for GeodeLinux kernel builds. Add /etc/udev/rules.d/10-
-local.rules file for symlinking videox -> video0 at hotplug event for Gentoo.
-Update /etc/udev/local.rules file for symlinking videox -> video0 at hotplug
-event for GeodeLinux.
-
-_____________________________________________________________________________
-Change: 78909
-_____________________________________________________________________________
-Patches for $ 'cross' compile. Gentoo and Debian store 32bit libraries in
-/lib32 and 64bit in /lib64. There are apparently two standards for this, but
-I'm patching gcc to follow Gentoo/Debian multilib convention. This is still
-giving a build failure in libstdc++-v3, however, pulling in multilib
-libraries.
-
-_____________________________________________________________________________
-Change: 81109
-_____________________________________________________________________________
-Remove xterm from validation-image. Symlink rxvt -> xterm instead. Replace
-eog with gqview in validation-image. Remove AMD_DRIVER_VERSION mangling from
-klocwork.bbclass. Add defconfig for klocwork kernel build.
-
-_____________________________________________________________________________
-Change: 81004
-_____________________________________________________________________________
-Move to libtool 1.5.22. Appears to resolve some obscure cross-linking issues.
-klocwork.bbclass - mipsel analysis was failing due to $ definition from
-project name to build name. If AMD_DRIVER_VERSION is defined, prefix project
-name with amd_, otherwise oe_ Add task kwinstall for installing report files.
-Add .bb files for X11R7.0 75DPI fonts. Add font-bh-75dpi to task-xorg Add xf86-video-
-vga to task-org as a fallback. Add xauth to validation-image Update default
-xorg.conf. z4l has been renamed to ztv. Add Eye of Gnome image viewer to validation-
-image. This depends upon *alot* of gnome, so it should be replaced or gnome
-should take over matchbox as session manager.
-
-_____________________________________________________________________________
-Change: 80378
-_____________________________________________________________________________
-Mesa compiles using the correct compiler. Remove redundant files from glib-
-2.0 packaging. More DEPENDS and site-packages.conf cleanup. Disable exclusive
-bsub for now. gcov-tools listed twice in validation-image.
-
-_____________________________________________________________________________
-Change: 80372
-_____________________________________________________________________________
-syslinux was moved upstream. Add to site-packages.conf.
-
-_____________________________________________________________________________
-Change: 80359
-_____________________________________________________________________________
-Add matchbox and xterm to validation-image. Replaces xfce. Add ica-bin-9.0,
-but this is broken until openmotif builds.
-
-_____________________________________________________________________________
-Change: 79975
-_____________________________________________________________________________
-Add perl and python to validation-image. record-play and pio_check use perl.
-pixel-depth and i2cval use python.
-
-_____________________________________________________________________________
-Change: 79680
-_____________________________________________________________________________
-Move GeodeLinux to ldcperforce1.
-
-_____________________________________________________________________________
-Change: 78811
-_____________________________________________________________________________
-Disable task-compilers in validation-image by default.
-
-Unit Test
----------
-_____________________________________________________________________________
-Change: 81004 : Move to libtool 1.5.22. Appears to resolve some obscure cross
-_____________________________________________________________________________
-HOST_ARCH definition. Move $PN
-
---------------------------------------------------------------------------------
-VALIDATION ENVIRONMENT
---------------------------------------------------------------------------------
-Validated on AMD Geode(TM) Norwich Development Board - Rev 2 Rework H and
-Rev 3 Rework E with:
-
-Processor: AMD Geode LX processor, silicon rev. C1 @ 433 MHz
-Chipset: AMD Geode CS5536 companion device, silicon rev. B1
-PCI Bus Speed: 66 MHz
-Memory: 256 MB PC3200 RAM
-CRT: NEC MultiSync FP2141SB
-Flat Panel: Samsung LTM213U3-L07 1600x1200 2-channel LVDS,
-Keyboard/Mouse: PS/2 on Moray 1.1
-
-BIOS: GeodeROM 1.06.06
-Operating System: Gentoo 2005.0
-Kernel: v2.6.11
-Kernel Patch: LX Kernel Patch v02.02.0100
-Graphics Driver: LX Xorg Graphics driver v03.00.0100
-Audio Driver: 5536 ALSA Audio driver v01.00.0500
-AES Driver: LX AES driver v02.01.0100
-AccessBus Driver: LX ACB Driver v01.00.0401
-Video4Linux2 Driver: LX Video4Linux2 driver v03.02.0100
-Other Software: N/A
-
---------------------------------------------------------------------------------
-INSTALLATION INSTRUCTIONS
---------------------------------------------------------------------------------
-Acquire Xorg Tarball from the Xorg web site:
-http://www.x.org/X11R6.8.1/
-
-For more information on X.org:
-http://xorg.freedesktop.org/wiki/
-
-Acquire Graphics_LinuxXorg_Common_03.00.0100.patch
-
-Unpack Xorg Tarball
-Patch the Source
-Make Xorg
-Construct Install
-Apply Install image
-
-for example:
- # tar -xzf X11R6.8.1-src.tar.gz
- # cd xc
- # patch -p1 < Graphics_LinuxXorg_Common_03.00.0100.patch
- # cp config/cf/xorgsite.def config/cf/host.def
-
-Edit config/cf/host.def
-uncomment the line:
-
-#define BuildSpecsDocs No
-
-Add the line (directly following the above line)
-
-#define InstallHardcopyDocs No
-
- # make World
- # mkdir <install_path>
- # make DESTDIR=<install_path> install install.man
- # tar -C <install_path> -czf <path>/xorg-x11-geode.tgz .
- move xorg-x11-geode.tgz to the target system
- login as root on the target system and make path to tarball available
- # tar -C / -xzpf <path>/xorg-x11-geode.tgz
- # mv /etc/X11/xorg.conf /etc/X11/xorg.conf.orig
- # cp <path>/xorg-<gx/lx>.conf /etc/X11/xorg.conf
-
-
-++++++++++++++++++++++++++++++++++++++++++++++++++
-AMD Geode(TM) LX processor Xorg.conf Specification
-++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Linux Xorg AMD GeodeLX Processor Configuration Specification
-
-
-The AMD Geode driver supports an accelerated interface to the
-hardware access layer for the graphical devices (cimarron library).
-To operate this API with a widely, a set of operational customizations
-were added to the xorg.conf configuration file. These specifications
-for the most part are passed unmodified to cimarron. This document
-only provides an overview of the customizations to the standard
-configuration file definitions.
-
-The xorg configuration (xorg.conf) file usually exists in the system
-configuration directory /etc/X11. The standard contents are documented
-in the manual pages, and can typically be accessed using:
-man XF86Config
-The file is divided into "sections". The following information
-illustrates the custom features added section by section.
-
-
-1. Device section:
-
-The devices section specifies the graphics driver selection. Currently,
-for the drivers that may be specified include:
Section "Device"
- Identifier "DevId"
- Driver "vesa" - or
- Driver "fbdev" - or
- Driver "amd"
-...
-EndSection
-
-The "vesa" and "fbdev" selections are documented by the manual pages
-man fbdev - or
-man vesa
-The "amd" driver has many selections that can be used to operate
-the interface configuration. These selections follow:
-
-
-2. Hardware Accelerations:
-
-This set of options are standard to the xorg "xaa" accelerations.
-The presents of the option disables the named functionality.
-Note that many accelerations depend on combinations with others,
-and so disabling one may have a more pervasive effect.
-
- Option "XaaNoCPUToScreenColorExpandFill"
- Option "XaaNoColor8x8PatternFillRect"
- Option "XaaNoColor8x8PatternFillTrap"
- Option "XaaNoDashedBresenhamLine"
- Option "XaaNoDashedTwoPointLine"
- Option "XaaNoImageWriteRect"
- Option "XaaNoMono8x8PatternFillRect"
- Option "XaaNoMono8x8PatternFillTrap"
- Option "XaaNoOffscreenPixmaps"
- Option "XaaNoPixmapCache"
- Option "XaaNoScanlineCPUToScreenColorExpandFill"
- Option "XaaNoScanlineImageWriteRect"
- Option "XaaNoScreenToScreenColorExpandFill"
- Option "XaaNoScreenToScreenCopy"
- Option "XaaNoSolidBresenhamLine"
- Option "XaaNoSolidFillRect"
- Option "XaaNoSolidFillTrap"
- Option "XaaNoSolidHorVertLine"
- Option "XaaNoSolidTwoPointLine"
-
-Certain hardware accelerations may be armed or disarmed by using:
-
- Option "HWcursor" (default) -or
- Option "SWcursor"
-
- Option "Compression" (default) -or
- Option "No Compression"
-
-
-Additionally, all accelerations may be armed or disarmed using:
-
- Option "Accel" (default) -or
- Option "No Accel"
-
-This option enables/disables all rendering accelerations, HW/SW cursor,
-and display compression. Certain accelerations may not be armed, even
-though they are inferred by the configuration, if video memory is in
-short supply.
-
-
-3. Modes section:
-
-The configuration file included with the driver delivery contains an
-optional "modes" section. This section asserts all of the standard
-graphics/video mode configuration data. This set of modes is a subset
-of the mode data in the cimarron library. Because these modes are
-included, they are passed to the cimarron driver for validation. Be
-aware that cimarron will select modes using a filtering function that
-uses a constrained distance search. The mode in cimarron's definitions
-that is "closest" to a mode defined - either builtin or user supplied -
-will normally be used by cimarron.
-
-This filtering effect can be factored out by specifying:
-
- Option "CustomMode"
-
-This has the effect of causing the mode validation to pass any mode
-in the mode pool, and allowing the selection of the specified mode
-during mode switch. Unfortunately, because the interface specification
-is not complete enough to support video modes. Only video modes that
-exist in cimarron are possible when selecting a TVOUT mode.
-
-
-4. More "Device" section Options:
-
-Since flat panels have fixed timing - that is, only one "real" mode -
-the mode switch operation that normally might select a wide variety
-of operational states must "adjust" the mode selection to fit the
-fixed panel timing. To communicate that the mode selection is for
-a flat panel, use:
- Option "FlatPanel"
-Note that the code expects that the flat panel will have been already
-selected by the BIOS setup. Conflicts produce configuration errors.
-The size adjustment usually involves scaling the source buffer
-dimensions to the raster image size supported by the flat-panel. The
-hardware supports this scaling operation transparently, and normally
-no special considerations are needed. The hardware scaling is limited
-to modes with horizontal aspects of less than 1024 pixels (buffer size
-limitation for scaling/filtering).
-
-The display may be "rotated" in three ways, ClockWise, Upside-Down and
-CounterClocwise using:
- Option "Rotate" "CW"
- Option "Rotate" "Invert"
- Option "Rotate" "CCW"
-This is accomplished using a "shadow" frame buffer, and using either
-a hardware or software operation to transform the image to the
-operational display buffer.
-
-Even though there is not strategic advantage, if you wish to use a
-shadow frame buffer and display the unrotated image - this is specified
-by using:
-
- Option "ShadowFB"
-
-
-5. TVOUT video modes.
-
-In order to enable TVOUT mode selection, a TV known encoder
-must be selected in the following way:
- Option "TV_Encoder" "ADV7171" -or
- Option "TV_Encoder" "SAA7127" -or
- Option "TV_Encoder" "FS454" -or
- Option "TV_Encoder" "ADV7300"
-There is no default for the encoder. This selection is mandatory
-to enable TVOUT modes.
-
-Most encoders support a variety of bus formats. Similarly, the
-amd driver can select the bus data format from the following list:
- Option "TV_Bus_Fmt" "disabled" - VOP output is disabled
- Option "TV_Bus_Fmt" "vip1_1" - VIP 1.1
- Option "TV_Bus_Fmt" "ccir656" - CCIR 656 output
- Option "TV_Bus_Fmt" "vip20_8bit" - 8-bit VIP 2.0 output
- Option "TV_Bus_Fmt" "vip20_16bit" - 16-bit VIP 2.0 output
- Option "TV_Bus_Fmt" "601_yuv_8bit" - 601 output, 8-bit YUV 4:2:2
- Option "TV_Bus_Fmt" "601_yuv_16bit" - 601 output, 16-bit YUV 4:2:2
- Option "TV_Bus_Fmt" "601_rgb_8_8_8" - 601 output, 24-bit RGB
- Option "TV_Bus_Fmt" "601_yuv_4_4_4" - 601 output, YUV 4:4:4
-Note that the "601" modes may need sync signals for correct operation.
-See the 601 flags below to operate these selections.
-
-Colorspace conversion requires a projective transformation to
-perform downsampling for the implied transformation. The sampling
-method may be specified by selecting from:
- Option "TV_Conversion" "cosited"
- Option "TV_Conversion" "interspersed"
- Option "TV_Conversion" "alternating"
-
-The TV standard selected normally specifies a known frame buffer/
-TV mode geometry. However, it is quite common that TV output
-devices may expect a blanked "overscan" area. The dx,dy marginal
-widths for the overscan area can be specified using:
- Option "TV_Overscan" "40:30"
-Note that the TV standard geometry will be scaled (and filtered) to
-downscale the source buffer to destination raster image.
-
-TVOUT operation may be conditioned with the following set of flags.
-Some of these flags are not especially usable except to the kernel,
-but are included for completeness.
-
-These "TV_Flags" identifiers are specified in a quoted comma
-separated list from the following identifier set:
- singlechipcompat - Enables SCx2xx compatibility mode..
- extendedsav - Enables extended SAV/EAV codes.
- vbi - Use the task bit to indicate VBI data.
- task - Set Task Bit to 1in VIP 2.0 mode. Default is 0.
- swap_uv - Swap the U and V data prior to output.
- swap_vbi - Swap the VBI bytes prior to output.
-for example:
- Option "TV_Flags" "swap_uv" -or
- Option "TV_Flags" "extendedsav:swap_uv"
-
-These "TV_601_Flags" identifiers are specified in a quoted comma
-separated list from the following identifier set:
- inv_de_pol - Invert the polarity of display enable
- inv_hs_pol - Invert the polarity of hsync
- inv_vs_pol - Invert the polarity of vsync
- vsync-4 - The VSync occurs 4 clocks earlier
- vsync-2 - The VSync occurs 2 clocks earlier
- vsync+0 - The VSync is not shifted at all
- vsync+2 - The Vsync occurs 2 clocks later
-for example:
- Option "TV_601_Flags" "inv_vs_pol"
-
-These "TV_Vsync_Select" identifiers are specified in a quoted comma
-separated list from the following identifier set:
- disabled - VSync out disabled
- vg - The VSync signal from the VG (video generator)
- vg_inv - The VSync signal from the VG (inverted)
- statreg17 - 1 written to VIP status bit 17 toggles vsync (0-1-0)
- statreg17_inv - 1 written to VIP status bit 17 toggles vsync (1-0-1)
-for example:
- Option "TV_Vsync_Select" "disabled"
-
-
-6. Screen section:
-
-The screen section selects among the other various sections for
-sets of operational parameters and constraints. A typical
-"Screen" section has the form:
-
-Section "Screen"
- Identifier "ScreenId"
- Device "Geode"
- Monitor "MonitorId"
- DefaultDepth 24
-
- SubSection "Display"
- Depth 24
- FbBpp 32
- Modes "1280x1024" "1024x768" "800x600" "640x480" "tv-ntsc" "tv-pal"
- EndSubsection
-...
-
+ Identifier "AMD Geode"
+ Driver "amd"
+ Option "blah" "blah"
+ ...
EndSection
-In this example, the "Modes" selection of the display subsection specifies a
-list of available modes. These modes are selectable using "Ctl-Alt-KpPlus" or
-"Ctl-Alt-KpMinus" on most PC keyboards. It is also possible to select a mode
-using the xrandr utility, as well as using the X library API.
-
-The DefaultDepth may be 24, 16 or 8. If the depth is 24, then the "FbBpp" line
-is needed to specify the frame buffer format as 32 bits (hardware limitation).
-If a custom mode is specified, care should be taken to be sure it does not
-collide with a "builtin" mode, since the builtin mode will supersede.
-
-For a more complete functional description, review that the cimarron
-reference and Geode LX processor functional specifications.
-
------------------------------------------------------------------------------
-RELEASE HISTORY
------------------------------------------------------------------------------
-Version 04.00.0000
-April 30, 2006
-
-Dependencies
-------------
-This release depends on and includes the following subcomponents:
-
-Linux Build Tool - Base GeodeLinux Build System - Version 00.00.0015
-Linux Build Tool - AMD Embedded - Version 00.00.0016
-Linux Build Tool - Bitbake engine - Version 00.00.0010
-Linux Build Tool - Openembedded - Version 00.00.0006
-
-Functional Changes
-------------------
-_____________________________________________________________________________
-Change: 77478
-_____________________________________________________________________________
-Archive 2.6.11 kernel and kernel modules.
-
-_____________________________________________________________________________
-Change: 78502
-_____________________________________________________________________________
-Tinderbox script name and version must match .bb
-
-_____________________________________________________________________________
-Change: 78443
-_____________________________________________________________________________
-Changes to xorg_7.0 BOM did not take the first time.
-
-_____________________________________________________________________________
-Change: 78552
-_____________________________________________________________________________
-Rename norwich and norwich-2.6.11 machines to geodelx and geodelx-2.6.11.
-
-_____________________________________________________________________________
-Change: 78556
-_____________________________________________________________________________
-Move geodelx machine to X11R7.0. Prepend BBPATH with devel directory for
-overriding local.conf without p4 edit.
-
-_____________________________________________________________________________
-Change: 78423
-_____________________________________________________________________________
-
-_____________________________________________________________________________
-Change: 77505
-_____________________________________________________________________________
-More path and version updates after projects/norwich to
-projects/geodelx rename.
-
-_____________________________________________________________________________
-Change: 78527
-_____________________________________________________________________________
-Don't let xorg try to identify the LinuxDistribution.
-
-_____________________________________________________________________________
-Change: 78561
-_____________________________________________________________________________
-Misc changes after geodelx and geodelx-2.6.11 X build testing.
-
-_____________________________________________________________________________
-Change: 78535
-_____________________________________________________________________________
-Move to tcltk 8.4.11 from upstream in attempts to squash this Tindebox
-failure.
-
-_____________________________________________________________________________
-Change: 78108
-_____________________________________________________________________________
-First stab at dvb-image. Everything compiles, but I am worried about DRI
-support in X, missing geode support in X, openGL support in qt-x11-free.
-Also, directFB may be a better direction; it is currently disabled in this
-mythtv build.
-
-_____________________________________________________________________________
-Change: 77965
-_____________________________________________________________________________
-Syncronize travis, sands, gcov, and simnow busybox configurations. Remove
-grep and tar from travis-db1200-2.6 and validation-image images. These are
-provided by busybox. Move IMAGE_ROOTFS_SIZE to the meta .bb files as this is
-psp specific and not necessarily distro specific.
-
-_____________________________________________________________________________
-Change: 77612
-_____________________________________________________________________________
-Monotone OE Sync
-
-_____________________________________________________________________________
-Change: 77802
-_____________________________________________________________________________
-CVSDATE renamed to SRCDATE.
-
-_____________________________________________________________________________
-Change: 77847
-_____________________________________________________________________________
-Decrease the size on the etx2 partition. norwich/sands/conf/local.conf points
-to norwich machine and not norwich-2.6.11.
-
-_____________________________________________________________________________
-Change: 77978
-_____________________________________________________________________________
-1. Update Norwich.conf and Samba.conf to 2.6.16
-2. Change version file: BBFile to BBFile2 and LinuxKernel to LinuxKernel2
-
-_____________________________________________________________________________
-Change: 77947
-_____________________________________________________________________________
-Adding samba machine configuration file. The difference right now, from
-existing norwich.conf is that this samba configures an X11R7 build. xserver-xorg-X11R7.0-
-1.0.1 builds with this changelist but has not been tested. Additionally, the
-AMD driver checked into Perforce has not yet been built here.
-
-================================================================================
-Version 03.00.0102
-April 10, 2006
-
-Dependencies
-------------
-This release depends on and includes the following subcomponents:
-
-Linux Build Tool - Base GeodeLinux Build System - Version 00.00.0013
-Linux Build Tool - AMD Embedded - Version 00.00.0014
-Linux Build Tool - Bitbake engine - Version 00.00.0009
-Linux Build Tool - Openembedded - Version 00.00.0006
-
-Functional Changes
-------------------
-_____________________________________________________________________________
-Change: 77441
-_____________________________________________________________________________
-Rename //drivers/projects/norwich to //drivers/projects/geodelx. This
-change includes:
- * Updates to P4MOD BOMs for 2.6.11 and 2.6.15 releases.
- * Updates to GeodeLinux .bb files for 2.6.11 and 2.6.15 builds.
- * P4MOD search path update.
-
-================================================================================
-Version: 03.00.0101, Release Notes
-Release Date: December 19, 2005
-
-Dependencies
-------------
-- Built with xorg-x11-6.7.0 from Fedora Core 2 Source Updates
-- Built with X11R6.8.1 from freedesktop.org
-
-- This driver has been tested with Linux Kernel 2.6.11
- using the Fedora Core 2 image environment
- using the Gentoo 2005.0 image environment
-
-- To use the Xv adaptor interface
- 1) create a "videox" link to the geodev4l2 video device in /dev
- ln -s video0 /dev/videox
- 2) uncomment the ' Load "z4l"' line in xorg.conf
-
-Functional Changes
-------------------
-Issue #4027
-
-Defects Corrected
------------------
-PBZ#6538 - X.org patch is incompletely licensed
-PBZ#4027 - HWCursor/Rotation, cursor does not traverse entire resolution area
-Description:
-When using HWCursor, cursor can not traverse the entire visable area of *MOST*
-(there are exceptions) rotated modes. The failures exist as edges which the
-cursor can not travel to. Failing edges differ according to rotation.
-Resolution:
-Cursor "hotspot" error corrected.
-
-PBZ#4463 - 8 bpp, x11perf SWCRC --> HWCRC comparison fails paint8_03 ...
-PBZ#4665 - LX Xorg Driver will not patch successfully if GX Xorg Pat...
-PBZ#5025 - mode changes with xrandr, graphics distorted
-
-Known Errata
-------------
-PBZ#4025 X - Rotations{90,270}, only lowest refresh rate pass mode validation
-Description:
-At 90 and 270 degree rotations, only the lowest supported refresh
-rate can be entered. The rest of the refresh rates appear to fail mode
-validation (xrandr does not see them as options, and I can not CTL->ALT->+/-
-through the modes). This issue does not occur at 0 or 180 degree rotations.
-Resolution:
-This is an inherent weakness of the X mode switch -- where even a
-full X R&R implementation would not fix this.
-Steps to address will need to be:
-(1) convert AMD rotation support to X R&R
-(2) patch X to better handle X R&R
-This may be addressed in a future version.
-
-PBZ#5993 - HWScaling mode hsync out of range error
-
-================================================================================
-Previous Version: 1.02.0900
-Release Date: 26 May 2005
-
-Dependencies
-------------
-- Built with xorg-x11-6.7.0 from Fedora Core 2 Source Updates
-- Built with X11R6.8.1 from freedesktop.org
-
-- This driver has been tested with Linux Kernel 2.6.11
- using the Fedora Core 2 image environment
- using the Gentoo 2004.3 image environment
-
-- To use the Xv adaptor interface
- 1) create a "videox" link to the geodev4l2 video device in /dev
- ln -s video0 /dev/videox
- 2) uncomment the ' Load "z4l"' line in xorg.conf
-
+The following options may be added to the section:
-Functional Changes
-------------------
-- First release
+== GX ==
-Defects Corrected
------------------
-- First release
+SWCursor: Enable software cursors (essentially disabling HW cursor support)
+NoCompression: Disable video bandwidth compression
+NoAccel: Disable hardware assisted acceleration
+AccelMethod: "EXA" (default) or "XAA"
+Rotate: Select a orientation to start with - LEFT, INVERT, CCW
+NoPanel: Disable panel support
+OSMImageBuffers: Set the number of image buffers (XAA only)
+OSMColorExpBuffers: Set the number of color expansion buffers (XAA only)
+FBSize: Specify the size of the video space (in bytes)
+PanelGeometry: Specify the geometry of the attached panel ("<width>x<height>")
-Known Errata
-------------
-Issue:
+== LX ==
-PBZ#4025 X - Rotations{90,270}, only lowest refresh rate pass mode validation
-Description:
-At 90 and 270 degree rotations, only the lowest supported refresh
-rate can be entered. The rest of the refresh rates appear to fail mode
-validation (xrandr does not see them as options, and I can not
-CTL->ALT->+/- through the modes). This issue does not occur at 0 or
-180 degree rotations.
-Resolution:
-This is an inherent weakness of the X mode switch -- where even a full X R&R
-implementation would not fix this.
-Steps to address will need to be:
-(1) convert AMD rotation support to X R&R
-(2) patch X to better handle X R&R
-This may be addressed in a future version.
+SWCursor: Enable software cursors (essentially disabling HW cursor support)
+NoCompression: Disable video bandwidth compression
+NoAccel: Disable hardware assisted acceleration
+Rotate: Select a orientation to start with - LEFT, INVERT, CCW
+NoPanel: Disable panel support
+ExaScratch: Specify the amount of extra EXA scratch buffer (in bytes)
+FBSize: Specify the size of the video space (in bytes)
+PanelGeometry: Specify the geometry of the attached panel ("<width>x<height>")
-================================================================================
-Copyright
----------
-Copyright 2005 Advanced Micro Devices, Inc. All rights reserved.
-The contents of this document are provided in connection with Advanced Micro
-Devices, Inc. ("AMD") products. AMD makes no representations or warranties
-with respect to the accuracy or completeness of the contents of this
-publication and reserves the right to make changes to specifications and
-product descriptions at any time without notice. No license, whether express,
-implied, arising by estoppel or otherwise, to any intellectual property rights
-is granted by this publication. Except as set forth in AMD's Standard Terms
-and Conditions of Sale, AMD assumes no liability whatsoever, and disclaims any
-express or implied warranty, relating to its products including, but not
-limited to, the implied warranty of merchantability, fitness for a particular
-purpose, or infringement of any intellectual property right. AMD's products
-are not designed, intended, authorized or warranted for use as components in
-systems intended for surgical implant into the body, or in other applications
-intended to support or sustain life, or in any other application in which the
-failure of AMD's product could create a situation where personal injury,
-death, or severe property or environmental damage may occur. AMD reserves the
-right to discontinue or make changes to its products at any time without notice.
-Trademarks
-----------
-AMD, the AMD Arrow logo, and combinations thereof, and Geode are trademarks
-of Advanced Micro Devices, Inc.
-Other product names used in this publication are for identification purposes
-only and may be trademarks of their respective companies.
-================================================================================
diff --git a/TODO b/TODO
index d81aad1..534aafc 100644
--- a/TODO
+++ b/TODO
@@ -1,27 +1,19 @@
-This is the list of things that need to be done
+General:
-=== LX driver ===
+* Add automagic probing of the fb driver (for memory size)
+* Write the man page
-CORE:
-* Compression is pretty much hosed
-* Artifacts are on the screen - they are probably render related
-* Screen panning
-* VT switching causes instablity
+GX:
-MOUSE:
-* Mouse is munged in 24bpp mode
+* Fix the options so they are sane (i.e eliminate one of SWCursor or HWCursor)
+* TV support
+* Fix the rotate text strings (CCW?)
+* Whitespace / indenting
+* Don't crash when rotating when playing video
-EXA:
-* Support a8 as a source or destination (?)
-* Convert masks with an alpha chanel to a8 and a4 masks (?)
-* Support multiple pass operations when a mask is enabled
-* See if we can figure out a way to set the correct alpha when the source
- format doesn't have an alpha channel but the destination does
-* Handle masks when the source isn't 1x1
-* Rendercheck still has many failures
-* We assume that the destination buffer fits in the scratch buffer during
- a multipass operation
-
-VIDEO:
-* Support rotated video (rotate the YUV source)
+LX:
+* Fix the options so they are sane
+* TV support (VOP)
+* Rotated video
+* ARGB cursor
diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644
index 9981874..0000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: Makefile.am,v 1.6 2005/12/06 22:48:36 kem Exp $
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
-#
-
-drivermandir = $(DRIVER_MAN_DIR)
-
-driverman_PRE = @DRIVER_NAME@.man
-
-driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-
-EXTRA_DIST = @DRIVER_NAME@.man
-
-CLEANFILES = $(driverman_DATA)
-
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
-
-.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
diff --git a/man/amd.man b/man/amd.man
deleted file mode 100644
index 86cf089..0000000
--- a/man/amd.man
+++ /dev/null
@@ -1,417 +0,0 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/amd/amd.man,v 1.1 2002/12/10 15:12:23 alanh Exp $
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH AMD __drivermansuffix__ __vendorversion__
-.SH NAME
-amd \- Amd video driver \- lx options
-.SH SYNOPSIS
-.nf
-.B "Section \*qDevice\*q"
-.BI " Identifier \*q" devname \*q
-.B " Driver \*qamd\*q"
-\ \ ...
-.B EndSection
-.fi
-.SH DESCRIPTION
-.B amd
-is an XFree86 driver for Advanced Micro Devicess GEODE processor family.
-It uses the CIMARRON kit provided by Advanced Micro Devices.
-The driver is accelerated, and provides support for the following
-framebuffer depths: 8, 16 and 24.
-.SH SUPPORTED HARDWARE
-The
-.B amd
-driver supports GeodeLX (5536 companion chip).
-.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
-details. This section only covers configuration details specific to this
-driver.
-.PP
-The driver will auto-detect the amount of video memory present.
-If actual the amount of active video memory should be changed,
-this may be specified with a
-.B VideoRam
-entry in the config file. The driver will attempt to allocate all
-public/free reigons from the framebuffer memory, as allocated by the
-kernel cimarron module. All private framebuffer reservations should
-be made before starting X. Note that X attempts to open /dev/video#
-devices during initialization, so that attached drivers may allocate
-framebuffer memory before X reserves it. X will try to reserve
-framebuffer memory using \*q/dev/cim\*q (char device node 10,156).
-.PP
-.B \*qDevice\*q
-section.
-.PP
-The following driver
-.B Options
-are supported:
-.TP
-.BI "Option \*qHWCursor\*q"
-.RS 0
-.BI "Option \*qSWCursor\*q"
-.RS
-Enable HW or SW cursor.
-.br
-Default: HW cursor.
-.RE
-.TP
-.BI "Option \*qAccel\*q"
-.RS 0
-.BI "Option \*qNoAccel\*q"
-.RS
-Disable or enable acceleration.
-.br
-Default: acceleration enabled.
-.RE
-.TP
-.BI "Option \*qCompression\*q"
-.RS 0
-.BI "Option \*qNoCompression\*q"
-.RS
-Disable or enable compression.
-.br
-Default: compression is enabled.
-.RE
-.TP
-.BI "Option \*qShadowFB\*q"
-.RS 0
-.BI "Option \*qNoShadowFB\*q"
-.RS
-Enable or disable use of the shadow framebuffer layer.
-.br
-Default: off.
-.RE
-.TP
-.BI "Option \*qRotate\*q \*qCW\*q"
-.RS 0
-.BI "Option \*qRotate\*q \*qInvert\*q"
-.RS 0
-.BI "Option \*qRotate\*q \*qCCW\*q"
-.RS
-The display may be "rotated" in 3 ways, ClockWise, Upside-Down and
-CounterClocwise using:
-This is accomplished using a \*qshadow\*q framebuffer, and using either
-a hardware or software operation to transform the image to the
-operational display buffer.
-.br
-Default: no rotation.
-.RE
-.TP
-.BI "Option \*qFPDestGeom\*q "\*qWxH\*q
-This allows the configuration to override the bios probe of the
-.B FlatPanel
-output interface.
-Since flat-panels have fixed timing - that is, only one \*qreal\*q mode -
-the mode switch operation which normally might select a wide variety
-of operational states must scale the mode selection to fit the
-fixed panel timing. This option is used to communicate that the mode
-selection is for a flat panel. When this option is used, the bios
-probe is skipped and the specified geometry is used to derive timings.
-.br
-Default: bios.
-.RE
-.TP
-.BI "Option \*qFPActiveGeom\*q "\*qWxH\*q
-This allows the configuration of the active flatpanel display area. This
-area must fit into the destination geometry area. The source (mode WxH)
-geometry will be scaled to the active geometry, and centered in the
-destination geometry of the
-.B FlatPanel
-output.
-.br
-Default: FPDestGeom.
-.RE
-.TP
-.BI "Option \*qFlatPanel\*q"
-.RS 0
-.BI "Option \*qNoFlatPanel\*q"
-.RS
-This allows the configuration to override the initialization probe
-to enable or disable the
-.B FlatPanel
-output interface.
-.br
-Default: bios.
-.RE
-.TP
-.BI "Option \*qCrtEnable\*q"
-.RS 0
-.BI "Option \*qNoCrtEnable\*q"
-.RS
-This allows the configuration to override the initialization probe
-to enable or disable the
-.B CRT
-output interface.
-.br
-Default: bios.
-.RE
-.TP
-.BI "Option \*qOSMImageBuffers\*q \*q" integer \*q
-This sets the number of scanline buffers to be allocated in offscreen
-scanline memory for acceleration. This can take any value 0 will disable
-the allocation. Disabled if cannot allocate requested scanline memory.
-.br
-Default: 20.
-.TP
-.BI "Option \*qOSMColorExpBuffers\*q \*q" integer \*q
-This sets the number of scanline buffers to be allocated in offscreen
-color expansiopn memory for acceleration. This can take any value 0
-will disable the allocation. Disabled if cannot allocate requested
-scanline memory.
-.br
-Default: 20.
-.PP
-.BI "TVOUT Options"
-.TP
-TVOUT is operated when a tv encoder has been selected by using the
-.B TV_Encoder
-option describe below, and a tv mode name is selected as the active
-display mode. The list of tv mode names are:
-.RS
- ModeName Geometry Std/Hi Encoders
- tv-ntsc 720x480 Std adv7171 saa7127 adv7300
- pnl-ntsc 640x480 Std fs454
- pnl-8x6_ntsc 800x600 Std fs454
- pnl-10x7_ntsc 1024x768 Std fs454
- tv-pal 720x576 Std adv7171 saa7127 adv7300
- pnl-pal 640x480 Std fs454
- pnl-8x6_pal 800x600 Std fs454
- pnl-10x7_pal 1024x768 Std fs454
- tv-480p 720x480 Hi adv7300
- pnl-480p 720x480 Hi fs454
- tv-720p 1280x720 Hi adv7300
- pnl-720p 1280x720 Hi fs454
- tv-1080i 1920x1080 Hi adv7300 fs454
-.br
-Default: none - manditory parameter
-.RE
-.TP
-.BI "Option \*qTV_Encoder\*q "\*qencoder\*q
-This option is manditory for TVOUT operation. It enables selection
-of the subset
-.B TVOUT
-modes which are permitted for the designated encoder family. The
-encoder must be one of:
- adv7171 - modes for the adv7171 encoder
- saa7127 - modes for the saa7127 encoder
- fs454 - modes for the fs454 encoder
- adv7300 - modes for the adv7300 encoder
-.br
-Default: none - manditory parameter
-.TP
-.BI "Option \*qTV_Bus_Fmt\*q "\*qformat\*q
-This option is optional for TVOUT operation. It selects the bus
-format of the
-.B TVOUT
-data. The format must be one of:
- disabled - VOP output is disabled
- vip1_1 - VIP 1.1
- ccir656 - CCIR 656 output
- vip20_8bit - 8-bit VIP 2.0 output
- vip20_16bit - 16-bit VIP 2.0 output
- 601_yuv_8bit - 601 output, 8-bit YUV 4:2:2
- 601_yuv_16bit - 601 output, 16-bit YUV 4:2:2
- 601_rgb_8_8_8 - 601 output, 24-bit RGB
- 601_yuv_4_4_4 - 601 output, YUV 4:4:4
-.br
-Default: vip1_1 for Std modes, vip20_16bit for Hi modes
-.TP
-.BI "Option \*qTV_Conversion\*q "\*qconversion\*q
-This option is optional for TVOUT operation. It selects the bus
-color conversion sampling method of the
-.B TVOUT
-data. The conversion must be one of:
-.br
- cosited - color conversion cosited sampling
- interspersed - color conversion interspersed sampling
- alternating - color conversion alternating sampling
-.br
-Default: cosited
-.TP
-.BI "Option \*qTV_Overscan\*q "\*qX:Y\*q
-This option is optional for TVOUT operation. It selects the image
-overscale size in pixels. The output image is downscaled and padded
-with a blanking region such that the resulting image contains a
-left and right margin of X pixels, and a top and bottom margin of Y
-pixels.
-.br
-Default: 0:0
-.TP
-.BI "Option \*qTV_Flags\*q "\*qflags\*q
-This option is optional for TVOUT operation. It selects standard
-features of the
-.B TVOUT
-data. The flags may be a \*q:\*q seperated list of:
-.br
- disabled - VOP output is disabled
- singlechipcompat - Enables SCx2xx compatibility mode..
- extendedsav - Enables extended SAV/EAV codes.
- vbi - Use the task bit to indicate VBI data.
- task - Set Task Bit to 1in VIP 2.0 mode.
- swap_uv - Swap the U and V data prior to output.
- swap_vbi - Swap the VBI bytes prior to output.
-.br
-Default: no active flags
-.TP
-.BI "Option \*qTV_601_Flags\*q "\*q601_flags\*q
-This option is optional for TVOUT operation. It selects 601
-features of the
-.B TVOUT
-data. The 601_flags may be a \*q:\*q seperated list of:
-.br
- inv_de_pol - Invert the polarity of display enable
- inv_hs_pol - Invert the polarity of hsync
- inv_vs_pol - Invert the polarity of vsync
- vsync-4 - The VSync occurs 4 clocks earlier
- vsync-2 - The VSync occurs 2 clocks earlier
- vsync+0 - The VSync is not shifted at all
- vsync+2 - The Vsync occurs 2 clocks later
-.br
-Default: vsync+0
-.TP
-.BI "Option \*qTV_Vsync_Select\*q "\*qsync_select\*q
-This option is optional for TVOUT operation. It selects the source
-for the
-.B VIP
-vsync output pin (not the
-.B VOP
-sync). This normally may be used to generate \*qgenlock\*q timing.
-The sync_select may one of:
-.br
- disabled - VSync out disabled
- vg - The VSync signal from the VG (video generator)
- vg_inv - The VSync signal from the VG (inverted)
- statreg17 - 1 written to VIP status[17] toggles vsync
- statreg17_inv - 1 written to VIP status[17] toggles vsync
-.br
-Default: disabled
-.SH NAME
-amd \- Amd video driver \- gx options
-.SH SYNOPSIS
-.nf
-.B "Section \*qDevice\*q"
-.BI " Identifier \*q" devname \*q
-.B " Driver \*qamd\*q"
-\ \ ...
-.B EndSection
-.fi
-.SH DESCRIPTION
-.B amd
-is an XFree86 driver for Advanced Micro Devices GEODE processor family.
-It uses the DURANGO kit provided by Advanced Micro Devices.
-The driver is accelerated, and provides support for the following
-framebuffer depths: 8, 16 and 24.
-.SH SUPPORTED HARDWARE
-The
-.B amd
-driver supports GXLV (5530 companion chip), SC1200, SC1400 and
-GX (5535 companion chip).
-.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
-details. This section only covers configuration details specific to this
-driver.
-.PP
-The driver will auto-detect the amount of video memory present for all
-chips. If the amount of memory is detected incorrectly, the actual amount
-of video memory should be specified with a
-.B VideoRam
-entry in the config file
-.B \*qDevice\*q
-section.
-.PP
-The following driver
-.B Options
-are supported:
-.TP
-.BI "Option \*qSWCursor\*q \*q" boolean \*q
-Enable or disable the SW cursor.
-Default: off.
-.TP
-.BI "Option \*qHWCursor\*q \*q" boolean \*q
-Enable or disable the HW cursor.
-Default: on.
-.TP
-.BI "Option \*qNoAccel\*q \*q" boolean \*q
-Disable or enable acceleration.
-Default: acceleration is enabled.
-.TP
-.BI "Option \*qNoCompression\*q \*q" boolean \*q
-Disable or enable compression.
-Default: compression is enabled.
-.TP
-.BI "Option \*qShadowFB\*q \*q" boolean \*q
-Enable or disable use of the shadow framebuffer layer.
-Default: off.
-.TP
-.BI "Option \*qRotate\*q \*qCW\*q"
-Rotate the display clockwise. This mode is unaccelerated, and uses
-the Shadow Frame Buffer layer.
-Default: no rotation.
-.TP
-.BI "Option \*qRotate\*q \*qCCW\*q"
-Rotate the display counterclockwise. This mode is unaccelerated, and
-uses the Shadow Frame Buffer layer.
-Default: no rotation.
-.TP
-.BI "Option \*qFlatPanel\*q \*q" boolean \*q
-This enables the FlatPanel display unit. The FlatPanel depends on the
-BIOS to do the Pnale h/w initialization.
-In GX based platforms with TFT part Flatpanel is enabled, and on CRT
-part is disabled.
-Default: off.
-.TP
-.BI "Option \*qOSMImageBuffers\*q \*q" integer \*q
-This sets the number of scanline buffers to be allocated in offscreen
-memory for acceleration. This can take any value 0 will disable the
-allocation. Disabled if cannot alocate requested scanline memory.
-Default: 20.
-.TP
-.BI "Option \*qColorKey\*q \*q" integer \*q
-This sets the default pixel value for the YUV video overlay key.
-Default: 0.
-.PP
-The following
-.B Options
-are supported only on SC1200 based platforms:
-.TP
-.BI "Option \*qTV\*q \*qPAL-768x576\*q"
-Selects the PAL TV display mode 768x576 and the depth is forced to 16 bpp.
-Default: no TV.
-.TP
-.BI "Option \*qTV\*q \*qPAL-720x576\*q"
-Selects the PAL TV display mode 720x576 and the depth is forced to 16 bpp.
-Default: no TV.
-.TP
-.BI "Option \*qTV\*q \*qNTSC-720x480\*q"
-Selects the NTSC TV display mode 720x480 and the depth is forced to 16 bpp.
-Default: no TV.
-.TP
-.BI "Option \*qTV\*q \*qNTSC-640x480\*q"
-Selects the NTSC TV display mode 640x480 and the depth is forced to 16 bpp.
-Default: no TV.
-.TP
-.BI "Option \*qTV_Output\*q \*qCOMPOSITE\*q"
-The selected TV mode output is coded for Composite signal.
-Default: no TV.
-.TP
-.BI "Option \*qTV_Output\*q \*qSVIDEO\*q"
-The selected TV mode output is coded for SVIDEO signal.
-Default: no TV.
-.TP
-.BI "Option \*qTV_Output\*q \*qYUV\*q"
-The selected TV mode output is coded for YUV signal.
-Default: no TV.
-.TP
-.BI "Option \*qTV_Output\*q \*qSCART\*q"
-The selected TV mode output is coded for SCART signal.
-Default: no TV.
-.TP
-.BI "Option \*qTVOverscan\*q \*xx:yy:ww:hh\*q"
-This option will let only the viewable display area smaller to be able to
-view on TV. The parameters xx: X-offset, yy: Y-offset, ww: Viewable width,
-hh: Viewable height.
-Default: no TV.
-.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
-.SH AUTHOR
-Author: William Morrow
diff --git a/src/amd.4.html b/src/amd.4.html
deleted file mode 100644
index 89795bb..0000000
--- a/src/amd.4.html
+++ /dev/null
@@ -1,439 +0,0 @@
-
-<!--
- $XFree86: xc/programs/Xserver/hw/xfree86/drivers/amd/amd.man,v 1.1 2002/12/10 15:12:23 alanh Exp $
- shorthand for double quote that works everywhere.
-
--->
-<!-- manual page source format generated by PolyglotMan v3.0.8+X.Org, -->
-<!-- available at http://polyglotman.sourceforge.net/ -->
-
-<html>
-<head>
-<title>AMD(4) manual page</title>
-</head>
-<body bgcolor='#efefef' text='black' link='blue' vlink='#551A8B' alink='red'>
-<a href='#toc'>Table of Contents</a><p>
-
-<h2><a name='sect0' href='#toc0'>Name</a></h2>
-amd - Amd video driver - lx options
-<h2><a name='sect1' href='#toc1'>Synopsis</a></h2>
-<br>
-<pre><b>Section "Device"</b>
-<b> Identifier "</b><i>devname</i><b>"</b>
-<b> Driver "amd"</b>
-&nbsp;&nbsp;...
-<b>EndSection</b>
-</pre>
-<h2><a name='sect2' href='#toc2'>Description</a></h2>
-<b>amd</b> is an XFree86 driver for Advanced Micro Devicess GEODE processor
-family. It uses the CIMARRON kit provided by Advanced Micro Devices. The
-driver is accelerated, and provides support for the following framebuffer
-depths: 8, 16 and 24.
-<h2><a name='sect3' href='#toc3'>Supported Hardware</a></h2>
-The <b>amd</b> driver supports GeodeLX
-(5536 companion chip).
-<h2><a name='sect4' href='#toc4'>Configuration Details</a></h2>
-Please refer to <a href='XF86Config.5.html'>XF86Config(5x)</a>
-
-for general configuration details. This section only covers configuration
-details specific to this driver. <p>
-The driver will auto-detect the amount of
-video memory present. If actual the amount of active video memory should
-be changed, this may be specified with a <b>VideoRam</b> entry in the config
-file. The driver will attempt to allocate all public/free reigons from
-the framebuffer memory, as allocated by the kernel cimarron module. All
-private framebuffer reservations should be made before starting X. Note
-that X attempts to open /dev/video# devices during initialization, so that
-attached drivers may allocate framebuffer memory before X reserves it.
-X will try to reserve framebuffer memory using "/dev/cim" (char device
-node 10,156). <p>
-<b>"Device"</b> section. <p>
-The following driver <b>Options</b> are supported:
-
-<dl>
-
-<dt><b>Option "HWCursor"</b> </dt>
-<dd><blockquote><b>Option "SWCursor"</b> <blockquote>Enable HW or SW cursor. <br>
-Default: HW cursor. </dd>
-</dl>
-</blockquote>
-
-<dl>
-
-<dt><b>Option "Accel"</b> </dt>
-<dd><blockquote><b>Option "NoAccel"</b> <blockquote>Disable or enable
-acceleration. <br>
-Default: acceleration enabled. </dd>
-</dl>
-</blockquote>
-
-<dl>
-
-<dt><b>Option "Compression"</b> </dt>
-<dd><blockquote><b>Option "NoCompression"</b>
-<blockquote>Disable or enable compression. <br>
-Default: compression is enabled. </dd>
-</dl>
-</blockquote>
-
-<dl>
-
-<dt><b>Option "ShadowFB"</b> </dt>
-<dd><blockquote><b>Option "NoShadowFB"</b> <blockquote>Enable
-or disable use of the shadow framebuffer layer. <br>
-Default: off. </dd>
-</dl>
-</blockquote>
-
-<dl>
-
-<dt><b>Option "Rotate" "CW"</b> </dt>
-<dd><blockquote><b>Option "Rotate" "Invert"</b> <blockquote><b>Option "Rotate"
-"CCW"</b> <blockquote>The display may be "rotated" in 3 ways, ClockWise, Upside-Down and
-CounterClocwise using: This is accomplished using a "shadow" framebuffer,
-and using either a hardware or software operation to transform the image
-to the operational display buffer. <br>
-Default: no rotation. </dd>
-</dl>
-</blockquote>
-
-<dl>
-
-<dt><b>Option "FPDestGeom" </b><i>"WxH"</i> </dt>
-<dd>This allows the configuration
-to override the bios probe of the <b>FlatPanel</b> output interface. Since flat-panels
-have fixed timing - that is, only one "real" mode - the mode switch operation
-which normally might select a wide variety of operational states must
-scale the mode selection to fit the fixed panel timing. This option is
-used to communicate that the mode selection is for a flat panel. When this
-option is used, the bios probe is skipped and the specified geometry is
-used to derive timings. <br>
-Default: bios. </dd>
-</dl>
-</blockquote>
-
-<dl>
-
-<dt><b>Option "FPActiveGeom" </b><i>"WxH"</i> </dt>
-<dd>This allows the configuration
-of the active flatpanel display area. This area must fit into the destination
-geometry area. The source (mode WxH) geometry will be scaled to the active
-geometry, and centered in the destination geometry of the <b>FlatPanel</b> output.
-<br>
-Default: FPDestGeom. </dd>
-</dl>
-</blockquote>
-
-<dl>
-
-<dt><b>Option "FlatPanel"</b> </dt>
-<dd><blockquote><b>Option "NoFlatPanel"</b> <blockquote>This allows
-the configuration to override the initialization probe to enable or disable
-the <b>FlatPanel</b> output interface. <br>
-Default: bios. </dd>
-</dl>
-</blockquote>
-
-<dl>
-
-<dt><b>Option "CrtEnable"</b> </dt>
-<dd><blockquote><b>Option "NoCrtEnable"</b> <blockquote>This allows the configuration
-to override the initialization probe to enable or disable the <b>CRT</b> output
-interface. <br>
-Default: bios. </dd>
-</dl>
-</blockquote>
-
-<dl>
-
-<dt><b>Option "OSMImageBuffers" "</b><i>integer</i><b>"</b> </dt>
-<dd>This sets the number of
-scanline buffers to be allocated in offscreen scanline memory for acceleration.
-This can take any value 0 will disable the allocation. Disabled if cannot
-allocate requested scanline memory. <br>
-Default: 20. </dd>
-
-<dt><b>Option "OSMColorExpBuffers" "</b><i>integer</i><b>"</b> </dt>
-<dd>This sets the number
-of scanline buffers to be allocated in offscreen color expansiopn memory
-for acceleration. This can take any value 0 will disable the allocation.
-Disabled if cannot allocate requested scanline memory. <br>
-Default: 20. </dd>
-</dl>
-<p>
-<b>TVOUT Options</b>
-<dl>
-
-<dt>TVOUT is operated when a tv encoder has been
-selected by using the </dt>
-<dd><b>TV_Encoder</b> option describe below, and a tv mode
-name is selected as the active display mode. The list of tv mode names
-are: <blockquote> ModeName <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; Geometry <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Std/Hi<tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Encoders<br>
- tv-ntsc <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 720x480 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Std <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;adv7171 saa7127 adv7300<br>
- pnl-ntsc <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 640x480 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Std <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;fs454<br>
- pnl-8x6_ntsc <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 800x600 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Std <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;fs454<br>
- pnl-10x7_ntsc<tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 1024x768 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Std <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;fs454<br>
- tv-pal <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 720x576 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Std <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;adv7171 saa7127 adv7300<br>
- pnl-pal <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 640x480 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Std <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;fs454<br>
- pnl-8x6_pal <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 800x600 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Std <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;fs454<br>
- pnl-10x7_pal <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 1024x768 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Std <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;fs454<br>
- tv-480p <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 720x480 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Hi <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;adv7300<br>
- pnl-480p <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 720x480 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Hi <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;fs454<br>
- tv-720p <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 1280x720 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Hi <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;adv7300<br>
- pnl-720p <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp; 1280x720 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Hi <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;fs454<br>
- tv-1080i <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;1920x1080 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;Hi <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;adv7300 fs454<br>
- <br>
-Default: none - </dd>
-</dl>
-manditory parameter </blockquote>
-
-<dl>
-
-<dt><b>Option "TV_Encoder" </b><i>"encoder"</i> </dt>
-<dd>This option
-is manditory for TVOUT operation. It enables selection of the subset <b>TVOUT</b>
-modes which are permitted for the designated encoder family. The encoder
-must be one of: adv7171 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- modes for the adv7171 encoder<br>
- saa7127 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- modes for the saa7127 encoder<br>
- fs454 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- modes for the fs454 encoder<br>
- adv7300 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- modes for the adv7300 encoder<br>
- <br>
-Default: none - manditory parameter </dd>
-
-<dt><b>Option "TV_Bus_Fmt" </b><i>"format"</i> </dt>
-<dd>This option
-is optional for TVOUT operation. It selects the bus format of the <b>TVOUT</b>
-data. The format must be one of: disabled <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- VOP output is disabled<br>
- vip1_1 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- VIP 1.1<br>
- ccir656 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- CCIR 656 output<br>
- vip20_8bit <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- 8-bit VIP 2.0 output<br>
- vip20_16bit <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- 16-bit VIP 2.0 output<br>
- 601_yuv_8bit <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- 601 output, 8-bit YUV 4:2:2<br>
- 601_yuv_16bit <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- 601 output, 16-bit YUV 4:2:2<br>
- 601_rgb_8_8_8 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- 601 output, 24-bit RGB<br>
- 601_yuv_4_4_4 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- 601 output, YUV 4:4:4<br>
- <br>
-Default: vip1_1 for Std modes, vip20_16bit for Hi modes </dd>
-
-<dt><b>Option "TV_Conversion"
-</b><i>"conversion"</i> </dt>
-<dd>This option is optional for TVOUT operation. It selects the
-bus color conversion sampling method of the <b>TVOUT</b> data. The conversion
-must be one of: <br>
- cosited <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- color conversion cosited sampling<br>
- interspersed <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- color conversion interspersed sampling<br>
- alternating <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- color conversion alternating sampling<br>
- <br>
-Default: cosited </dd>
-
-<dt><b>Option "TV_Overscan" </b><i>"X:Y"</i> </dt>
-<dd>This option is optional for
-TVOUT operation. It selects the image overscale size in pixels. The output
-image is downscaled and padded with a blanking region such that the resulting
-image contains a left and right margin of X pixels, and a top and bottom
-margin of Y pixels. <br>
-Default: 0:0 </dd>
-
-<dt><b>Option "TV_Flags" </b><i>"flags"</i> </dt>
-<dd>This option is optional for TVOUT
-operation. It selects standard features of the <b>TVOUT</b> data. The flags may
-be a ":" seperated list of: <br>
- disabled <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- VOP output is disabled<br>
- singlechipcompat<tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- Enables SCx2xx compatibility mode..<br>
- extendedsav <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- Enables extended SAV/EAV codes.<br>
- vbi <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- Use the task bit to indicate VBI data.<br>
- task <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- Set Task Bit to 1in VIP 2.0 mode.<br>
- swap_uv <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- Swap the U and V data prior to output.<br>
- swap_vbi <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- Swap the VBI bytes prior to output.<br>
- <br>
-Default: no active flags </dd>
-
-<dt><b>Option "TV_601_Flags" </b><i>"601_flags"</i> </dt>
-<dd>This option
-is optional for TVOUT operation. It selects 601 features of the <b>TVOUT</b>
-data. The 601_flags may be a ":" seperated list of: <br>
- inv_de_pol <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- Invert the polarity of display enable<br>
- inv_hs_pol <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- Invert the polarity of hsync<br>
- inv_vs_pol <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- Invert the polarity of vsync<br>
- vsync-4 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- The VSync occurs 4 clocks earlier<br>
- vsync-2 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- The VSync occurs 2 clocks earlier<br>
- vsync+0 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- The VSync is not shifted at all<br>
- vsync+2 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- The Vsync occurs 2 clocks later <br>
- <br>
-Default: vsync+0 </dd>
-
-<dt><b>Option "TV_Vsync_Select" </b><i>"sync_select"</i> </dt>
-<dd>This option is
-optional for TVOUT operation. It selects the source for the <b>VIP</b> vsync
-output pin (not the <b>VOP</b> sync). This normally may be used to generate "genlock"
-timing. The sync_select may one of: <br>
- disabled <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- VSync out disabled<br>
- vg <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- The VSync signal from the VG (video generator)<br>
- vg_inv <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- The VSync signal from the VG (inverted)<br>
- statreg17 <tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- 1 written to VIP status[17] toggles vsync<br>
- statreg17_inv<tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;- 1 written to VIP status[17] toggles vsync<br>
- <br>
-Default: </dd>
-</dl>
-disabled </blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-
-<h2><a name='sect5' href='#toc5'>Name</a></h2>
-amd - Amd video driver - gx options
-<h2><a name='sect6' href='#toc6'>Synopsis</a></h2>
-<br>
-<pre><b>Section "Device"</b>
-<b> Identifier "</b><i>devname</i><b>"</b>
-<b> Driver "amd"</b>
-&nbsp;&nbsp;...
-<b>EndSection</b>
-</pre>
-<h2><a name='sect7' href='#toc7'>Description</a></h2>
-<b>amd</b> is an XFree86 driver for Advanced Micro Devices GEODE processor
-family. It uses the DURANGO kit provided by Advanced Micro Devices. The driver
-is accelerated, and provides support for the following framebuffer depths:
-8, 16 and 24.
-<h2><a name='sect8' href='#toc8'>Supported Hardware</a></h2>
-The <b>amd</b> driver supports GXLV (5530 companion
-chip), SC1200, SC1400 and GX (5535 companion chip).
-<h2><a name='sect9' href='#toc9'>Configuration Details</a></h2>
-Please
-refer to <a href='XF86Config.5.html'>XF86Config(5x)</a>
- for general configuration details. This section
-only covers configuration details specific to this driver. <p>
-The driver will
-auto-detect the amount of video memory present for all chips. If the amount
-of memory is detected incorrectly, the actual amount of video memory should
-be specified with a <b>VideoRam</b> entry in the config file <b>"Device"</b> section.
-<p>
-The following driver <b>Options</b> are supported:
-<dl>
-
-<dt><b>Option "SWCursor" "</b><i>boolean</i><b>"</b>
-</dt>
-<dd>Enable or disable the SW cursor. Default: off. </dd>
-
-<dt><b>Option "HWCursor" "</b><i>boolean</i><b>"</b>
-</dt>
-<dd>Enable or disable the HW cursor. Default: on. </dd>
-
-<dt><b>Option "NoAccel" "</b><i>boolean</i><b>"</b>
-</dt>
-<dd>Disable or enable acceleration. Default: acceleration is enabled. </dd>
-
-<dt><b>Option
-"NoCompression" "</b><i>boolean</i><b>"</b> </dt>
-<dd>Disable or enable compression. Default: compression
-is enabled. </dd>
-
-<dt><b>Option "ShadowFB" "</b><i>boolean</i><b>"</b> </dt>
-<dd>Enable or disable use of the shadow
-framebuffer layer. Default: off. </dd>
-
-<dt><b>Option "Rotate" "CW"</b> </dt>
-<dd>Rotate the display
-clockwise. This mode is unaccelerated, and uses the Shadow Frame Buffer
-layer. Default: no rotation. </dd>
-
-<dt><b>Option "Rotate" "CCW"</b> </dt>
-<dd>Rotate the display counterclockwise.
-This mode is unaccelerated, and uses the Shadow Frame Buffer layer. Default:
-no rotation. </dd>
-
-<dt><b>Option "FlatPanel" "</b><i>boolean</i><b>"</b> </dt>
-<dd>This enables the FlatPanel display
-unit. The FlatPanel depends on the BIOS to do the Pnale h/w initialization.
-In GX based platforms with TFT part Flatpanel is enabled, and on CRT part
-is disabled. Default: off. </dd>
-
-<dt><b>Option "OSMImageBuffers" "</b><i>integer</i><b>"</b> </dt>
-<dd>This sets the
-number of scanline buffers to be allocated in offscreen memory for acceleration.
-This can take any value 0 will disable the allocation. Disabled if cannot
-alocate requested scanline memory. Default: 20. </dd>
-
-<dt><b>Option "ColorKey" "</b><i>integer</i><b>"</b>
-</dt>
-<dd>This sets the default pixel value for the YUV video overlay key. Default:
-0. </dd>
-</dl>
-<p>
-The following <b>Options</b> are supported only on SC1200 based platforms:
-
-<dl>
-
-<dt><b>Option "TV" "PAL-768x576"</b> </dt>
-<dd>Selects the PAL TV display mode 768x576 and the
-depth is forced to 16 bpp. Default: no TV. </dd>
-
-<dt><b>Option "TV" "PAL-720x576"</b> </dt>
-<dd>Selects
-the PAL TV display mode 720x576 and the depth is forced to 16 bpp. Default:
-no TV. </dd>
-
-<dt><b>Option "TV" "NTSC-720x480"</b> </dt>
-<dd>Selects the NTSC TV display mode 720x480
-and the depth is forced to 16 bpp. Default: no TV. </dd>
-
-<dt><b>Option "TV" "NTSC-640x480"</b>
-</dt>
-<dd>Selects the NTSC TV display mode 640x480 and the depth is forced to 16
-bpp. Default: no TV. </dd>
-
-<dt><b>Option "TV_Output" "COMPOSITE"</b> </dt>
-<dd>The selected TV mode
-output is coded for Composite signal. Default: no TV. </dd>
-
-<dt><b>Option "TV_Output"
-"SVIDEO"</b> </dt>
-<dd>The selected TV mode output is coded for SVIDEO signal. Default:
-no TV. </dd>
-
-<dt><b>Option "TV_Output" "YUV"</b> </dt>
-<dd>The selected TV mode output is coded for
-YUV signal. Default: no TV. </dd>
-
-<dt><b>Option "TV_Output" "SCART"</b> </dt>
-<dd>The selected TV mode
-output is coded for SCART signal. Default: no TV. </dd>
-
-<dt><b>Option "TVOverscan" x:yy:ww:hh"</b>
-</dt>
-<dd>This option will let only the viewable display area smaller to be able
-to view on TV. The parameters xx: X-offset, yy: Y-offset, ww: Viewable width,
-hh: Viewable height. Default: no TV. </dd>
-</dl>
-
-<h2><a name='sect10' href='#toc10'>See Also</a></h2>
-<a href='XFree86.1.html'>XFree86(1)</a>
-, <a href='XF86Config.5.html'>XF86Config(5x)</a>
-,
-<a href='xf86config.1.html'>xf86config(1)</a>
-, <a href='Xserver.1.html'>Xserver(1)</a>
-, <a href='X.7.html'>X(7)</a>
-
-<h2><a name='sect11' href='#toc11'>Author</a></h2>
-Author: William Morrow <p>
-
-<hr><p>
-<a name='toc'><b>Table of Contents</b></a><p>
-<ul>
-<li><a name='toc0' href='#sect0'>Name</a></li>
-<li><a name='toc1' href='#sect1'>Synopsis</a></li>
-<li><a name='toc2' href='#sect2'>Description</a></li>
-<li><a name='toc3' href='#sect3'>Supported Hardware</a></li>
-<li><a name='toc4' href='#sect4'>Configuration Details</a></li>
-<li><a name='toc5' href='#sect5'>Name</a></li>
-<li><a name='toc6' href='#sect6'>Synopsis</a></li>
-<li><a name='toc7' href='#sect7'>Description</a></li>
-<li><a name='toc8' href='#sect8'>Supported Hardware</a></li>
-<li><a name='toc9' href='#sect9'>Configuration Details</a></li>
-<li><a name='toc10' href='#sect10'>See Also</a></li>
-<li><a name='toc11' href='#sect11'>Author</a></li>
-</ul>
-</body>
-</html>
diff --git a/src/cim/cim_defs.h.rej b/src/cim/cim_defs.h.rej
deleted file mode 100644
index 3d892c6..0000000
--- a/src/cim/cim_defs.h.rej
+++ /dev/null
@@ -1,45 +0,0 @@
-***************
-*** 208,227 ****
- *-----------------------------------------------------------------*/
-
- #define MSR_WRITE(msr,adr,val) \
-- { int d0, d1, d2, d3, d4; \
- __asm__ __volatile__( \
- " mov $0x0AC1C, %%edx\n" \
- " mov $0xFC530007, %%eax\n" \
- " out %%eax,%%dx\n" \
- " add $2,%%dl\n" \
-- " mov %5, %4\n" \
-- " mov 0(%6), %1\n" \
-- " mov 4(%6), %0\n" \
-- " xor %3, %3\n" \
- " xor %2, %2\n" \
-- " out %%ax, %%dx" \
-- : "=a" (d0), "=b" (d1), "=&D" (d2), "=&S" (d3), "=c" (d4) \
-- : "2" (msr | adr), "3" (val)); \
- }
-
- #elif CIMARRON_MSR_KERNEL_ROUTINE
---- 208,229 ----
- *-----------------------------------------------------------------*/
-
- #define MSR_WRITE(msr,adr,val) \
-+ { int d0, d1, d2, d3; \
- __asm__ __volatile__( \
-+ " push %%ebx\n" \
- " mov $0x0AC1C, %%edx\n" \
- " mov $0xFC530007, %%eax\n" \
- " out %%eax,%%dx\n" \
- " add $2,%%dl\n" \
-+ " mov %4, %3\n" \
-+ " mov 0(%5), %%ebx\n" \
-+ " mov 4(%5), %0\n" \
- " xor %2, %2\n" \
-+ " xor %1, %1\n" \
-+ " out %%ax, %%dx\n" \
-+ " pop %%ebx\n" \
-+ : "=a" (d0), "=&D" (d1), "=&S" (d2), "=c" (d3) \
-+ : "1" (msr | adr), "2" (val)); \
- }
-
- #elif CIMARRON_MSR_KERNEL_ROUTINE