merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 52 insertions, 27 deletions

diff --git a/README.sgml b/README.sgml
index c129da9..3dba59b 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,55 +1,80 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN">
+<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 <article>
 
 <title>Information for DEC 21030 Users (aka TGA)
 <author>The XFree86 Project, Inc.
-<date>26th February 1998
+<date>March 5th, 2000
+
+<ident>
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.9 2000/03/06 22:59:23 dawes Exp $
+</ident>
+
 <toc>
 
 <p>
 <sect>DEC 21030
 <p>
 <itemize>
-<item>The DEC 21030 is supported by XFree86 in this release of XFree86 3.3.
+<item>The DEC 21030 is supported by XFree86 &relvers;.  The driver is now
+partially accelerated.  The built-in graphics on the Multia is
+supported in 8-plane mode, and PCI cards with 8 or 16 MB framebuffers
+are supported in 24-plane mode.  TGA2 (aka PowerStorm 3D30/4D20)
+cards are not currently supported.
 
 <item>Current Known Problems
 
 <enum>
-<item>Only one modeline is accepted, this will be the first viable one
-that matches other criteria.
 
-<item>Due to the above, Virtual Resolutions is not supported either.
+<item>Virtual desktops and multiple modelines do not work.  You should
+specify only one modeline.
+
+<item>Hardware cursor is only supported on systems with the BT485
+ramdac, ie the Multia.
 
-<item>VideoRam is currently limited to 2MB.
+<item>After the server has been run using the hardware cursor, the
+Linux TGA console cursor (which also uses the hardware cursor) is
+shifted down by one pixel. This problem does not affect Linux kernels
+2.2.10 and above, which do not use the hardware cursor.
+
+<item>The XAA PolySegment() method is buggy. If you experience server
+crashes with SIGFPE, or server hangs, try disabling it (see below).
 
-<item>The 8plane 21030 is currently the only supported chipset. I don't
-have access to the 24plane or the 24plane3D chip.
 </enum>
 
 <item>The following options may be specified for the 21030 driver:
 <descrip>
-<tag>Option &dquot;dac_8_bit&dquot;</tag>
-	Turn on 8Bit BT485 RamDac.
-<tag>Option &dquot;dac_6_bit&dquot;</tag>
-	Turn on 6Bit BT485 RamDac.
-<tag>MemBase &dquot;0x???????&dquot;</tag>
-	If the server does not detect the base address of the 21030, then
-	Check /proc/pci for the 21030 and look for the "Prefetchable 32 bit
-	memory at 0x???????" and enter this as your MemBase setting.
-	In XFree86 v3.3.2, if you are using Linux > v2.0.27 with the PCI
-	routines the server should detect the base address automatically.
+<tag>BusID "PCI:?:??:?"</tag> Currently it is necessary to
+        specify the BusID so that the server will find the card.
+        Check /proc/pci and look for the bus, device, and function
+        numbers in the 21030 section.  On a Multia, this should be
+        &dquot;PCI:0:11:0&dquot;.
+	
+<tag>MemBase 0x???????</tag> If the server does not
+	detect the base address of the 21030, then check /proc/pci for
+	the 21030 and look for the "Prefetchable 32 bit memory
+	at 0x???????" and enter this as your MemBase setting.
+	
+<tag>Option "NoAccel"</tag>
+        Disables acceleration.
+
+<tag>Option "swcursor"</tag>
+        Disables the hardware cursor.
+
+<tag>Option "NoXaaPolySegment"</tag>
+	Disables the XAA PolySegment() method.
 
 </descrip>
-<item>No acceleration features of the 21030 have been taken advantage of yet!
 </itemize>
 
-<sect> Additional Notes <p>
-The code for the 21030 as yet - has only been tested on DEC's UDB box, better
-known as the Multia, in a Linux environment.
-
+<sect>Authors
 <p>
-<verb>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.6.2.3 1998/02/26 20:11:25 hohndel Exp $
-</verb>
+<itemize>
+<item>Matthew Grossman, <email>mattg@oz.net</email>
+<item>Alan Hourihane, <email>alanh@fairlite.demon.co.uk</email>
+<item>Martin Lucina, <email>mato@kotelna.sk</email>
+<item>Tim Rowley, <email>tor@cs.brown.edu</email>
+</itemize>
 
 </article>