[1] Add i810 driver to AMD64 package.

[2] Put the manpages from section 4 under 4x.  For example, you can do
    "man 4x vga" to get the X vga(4x) manpage, still do man 4 cirrus to get
    cirrus(4x), and man -a vga to get both vga manpages.
[3] Apply several important-looking fixes to ATI drivers from the stable branch:
    - Fix mode setting with Mach64 on some laptops.
    - Don't crash with mach64 for some PCI configurations
    - Improve hang detection on r128s. (may improve speed in DRI, too)
    - Avoid a hang on server regen on r128 with DRI.
    - Fix the DynamicClocks support, which could have caused hangs with DRI on
      original Radeons.

PR:		[2] ports/25576
Submitted by:	[2] fanf
Requested by:	[1] peter
Obtained from:	[3] XORG-6_8-branch

1 files changed, 54 insertions, 0 deletions

diff --git a/x11-servers/xorg-server-snap/files/patch-ati-591 b/x11-servers/xorg-server-snap/files/patch-ati-591
new file mode 100644
index 000000000000..dc8e099f078a
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-ati-591
@@ -0,0 +1,54 @@
+Index: programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v
+retrieving revision 1.3
+retrieving revision 1.3.4.1
+diff -u -u -r1.3 -r1.3.4.1
+--- programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c	26 Jul 2004 19:14:58 -0000	1.3
++++ programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c	15 Dec 2004 07:58:15 -0000	1.3.4.1
+@@ -1918,11 +1918,11 @@
+                    VBlankEnd += 0x0100U;
+ 
+                 pATI->LCDHBlankWidth = HBlankEnd - HBlankStart;
+-                pATI->LCDHSyncStart = HSyncStart - HBlankStart - 1;
++                pATI->LCDHSyncStart = HSyncStart - HBlankStart;
+                 pATI->LCDHSyncWidth = HSyncEnd - HSyncStart;
+ 
+                 pATI->LCDVBlankWidth = VBlankEnd - VBlankStart;
+-                pATI->LCDVSyncStart = VSyncStart - VBlankStart - 1;
++                pATI->LCDVSyncStart = VSyncStart - VBlankStart;
+                 pATI->LCDVSyncWidth = VSyncEnd - VSyncStart;
+ 
+                 HDisplay = HTotal + 5 - pATI->LCDHBlankWidth;
+Index: programs/Xserver/hw/xfree86/drivers/ati/ativga.c
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c,v
+retrieving revision 1.2
+retrieving revision 1.2.4.1
+diff -u -u -r1.2 -r1.2.4.1
+--- programs/Xserver/hw/xfree86/drivers/ati/ativga.c	23 Apr 2004 19:26:46 -0000	1.2
++++ programs/Xserver/hw/xfree86/drivers/ati/ativga.c	15 Dec 2004 07:58:15 -0000	1.2.4.1
+@@ -185,7 +185,11 @@
+             (pATI->Chip >= ATI_CHIP_264CT))
+             pMode->CrtcHBlankStart--;
+         pMode->CrtcHSyncStart = pMode->HSyncStart >> 3;
++        if (pATI->LCDPanelID >= 0)
++            pMode->CrtcHSyncStart--;
+         pMode->CrtcHSyncEnd = pMode->HSyncEnd >> 3;
++        if (pATI->LCDPanelID >= 0)
++            pMode->CrtcHSyncEnd--;
+         pMode->CrtcHBlankEnd = (pMode->HTotal >> 3) - 1;
+         pMode->CrtcHTotal = (pMode->HTotal >> 3) - 5;
+         pMode->CrtcHSkew = pMode->HSkew;
+@@ -327,6 +331,11 @@
+         pMode->CrtcVBlankStart++;
+     else
+         pMode->CrtcVBlankStart--;
++    if (pATI->LCDPanelID >= 0)
++    {
++        pMode->CrtcVSyncStart--;
++        pMode->CrtcVSyncEnd--;
++    }
+     pMode->CrtcVBlankEnd--;
+     if (pATI->Chip < ATI_CHIP_264CT)
+         pMode->CrtcVBlankEnd--;