18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW

    a changed license. There was only one change which happened to be from
    me (Egbert Eich).

18 files changed, 18 insertions, 65 deletions

diff --git a/man/trident.man b/man/trident.man
index b9eeae8..57c6813 100644
--- a/man/trident.man
+++ b/man/trident.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man,v 1.15 2003/07/03 07:52:46 alanh Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man,v 1.14 2003/05/29 21:48:09 herrb Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH TRIDENT __drivermansuffix__ __vendorversion__
diff --git a/src/blade_accel.c b/src/blade_accel.c
index b52a718..cf4ccf2 100644
--- a/src/blade_accel.c
+++ b/src/blade_accel.c
@@ -23,7 +23,7 @@
  * 
  * Trident Blade3D accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/blade_accel.c,v 1.22 2004/01/21 22:31:54 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/blade_accel.c,v 1.21 2003/10/30 13:38:01 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -277,8 +277,6 @@ BladeSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    BladeSync(pScrn);
-
     pTrident->BltScanDirection = 0;
     if ((xdir < 0) || (ydir < 0)) pTrident->BltScanDirection |= 1<<1;
 
@@ -471,8 +469,6 @@ BladeSetupForFillRectSolid(ScrnInfoPtr pScrn, int color,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    BladeSync(pScrn);
-
     REPLICATE(color);
     BLADE_OUT(0x2160, color);
     BLADE_OUT(0x2148, XAACopyROP[rop]);
@@ -541,8 +537,6 @@ BladeSetupForCPUToScreenColorExpand(ScrnInfoPtr pScrn,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    BladeSync(pScrn);
-
     pTrident->BltScanDirection = 0;
     BLADE_OUT(0x2148, XAACopyROP[rop]);
     if (bg == -1) {
@@ -683,8 +677,6 @@ static void BladeSetupForImageWrite(
 ){
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    BladeSync(pScrn);
-
     BLADE_OUT(0x2148, XAACopyROP[rop]);
     pTrident->BltScanDirection = 0;
 #if 0
diff --git a/src/image_accel.c b/src/image_accel.c
index e819411..61017b5 100644
--- a/src/image_accel.c
+++ b/src/image_accel.c
@@ -23,7 +23,7 @@
  * 
  * Trident 3DImage' accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/image_accel.c,v 1.27 2004/01/21 22:57:34 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/image_accel.c,v 1.26 2003/10/30 13:38:01 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -292,8 +292,6 @@ ImageSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    ImageSync(pScrn);
-
     pTrident->BltScanDirection = 0;
     if ((xdir < 0) || (ydir < 0)) pTrident->BltScanDirection |= 1<<2;
 
@@ -354,8 +352,6 @@ ImageSetupForSolidLine(ScrnInfoPtr pScrn, int color,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    ImageSync(pScrn);
-
     REPLICATE(color);
     IMAGE_OUT(0x2120, 0x84000000);
     IMAGE_OUT(0x2120, 0x90000000 | XAACopyROP[rop]);
@@ -408,8 +404,6 @@ ImageSetupForFillRectSolid(ScrnInfoPtr pScrn, int color,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    ImageSync(pScrn);
-
     REPLICATE(color);
     IMAGE_OUT(0x2120, 0x80000000);
     IMAGE_OUT(0x2120, 0x90000000 | XAACopyROP[rop]);
@@ -474,8 +468,6 @@ ImageSetupForMono8x8PatternFill(ScrnInfoPtr pScrn,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    ImageSync(pScrn);
-
     IMAGE_OUT(0x2120, 0x90000000 | XAAPatternROP[rop]);
     if (bg == -1) {
 	REPLICATE(fg);
@@ -520,8 +512,6 @@ ImageSetupForColor8x8PatternFill(ScrnInfoPtr pScrn,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    ImageSync(pScrn);
-
     IMAGE_OUT(0x2120, 0x90000000 | XAAPatternROP[rop]);
     IMAGE_OUT(0x2120, 0x80000000 | 1<<26);
     if (transparency_color != -1) {
@@ -557,8 +547,6 @@ ImageSetupForScanlineCPUToScreenColorExpandFill(
 ){
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    ImageSync(pScrn);
-
     IMAGE_OUT(0x2120, 0x80000000);
     IMAGE_OUT(0x2120, 0x90000000 | XAACopyROP[rop]);
     if (bg == -1) {
@@ -611,9 +599,6 @@ ImageSetupForScanlineImageWrite(ScrnInfoPtr pScrn, int rop,
                              int bpp, int depth)
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-
-    ImageSync(pScrn);
-
     IMAGE_OUT(0x2120, 0x90000000 | XAACopyROP[rop]);
     if (transparency_color != -1) {
 	IMAGE_OUT(0x2120, 0x70000000 | 1<<26 | (transparency_color&0xffffff));
diff --git a/src/trident.h b/src/trident.h
index ddae58e..c3fda74 100644
--- a/src/trident.h
+++ b/src/trident.h
@@ -21,7 +21,7 @@
  *
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h,v 1.60 2003/10/30 13:38:01 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h,v 1.59 2003/09/05 22:07:28 alanh Exp $ */
 /*#define VBE_INFO*/
 
 #ifndef _TRIDENT_H_
diff --git a/src/trident_accel.c b/src/trident_accel.c
index 149c019..280bde2 100644
--- a/src/trident_accel.c
+++ b/src/trident_accel.c
@@ -23,7 +23,7 @@
  * 
  * Trident accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c,v 1.29 2004/01/21 22:57:34 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c,v 1.28 2003/10/30 13:38:01 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -276,8 +276,6 @@ TridentSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
     int dst = 0;
 
-    TridentSync(pScrn);
-
     pTrident->BltScanDirection = 0;
     if (xdir < 0) pTrident->BltScanDirection |= XNEG;
     if (ydir < 0) pTrident->BltScanDirection |= YNEG;
@@ -324,8 +322,6 @@ TridentSetupForSolidLine(ScrnInfoPtr pScrn, int color,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    TridentSync(pScrn);
-
     pTrident->BltScanDirection = 0;
     REPLICATE(color);
     TGUI_FMIX(XAAPatternROP[rop]);
@@ -387,8 +383,6 @@ TridentSetupForDashedLine(
     CARD32 *DashPattern = (CARD32*)pattern;
     CARD32 NiceDashPattern = DashPattern[0];
 
-    TridentSync(pScrn);
-
     NiceDashPattern = *((CARD16 *)pattern) & ((1<<length) - 1);
     switch(length) {
 	case 2:	NiceDashPattern |= NiceDashPattern << 2;
@@ -450,8 +444,6 @@ TridentSetupForFillRectSolid(ScrnInfoPtr pScrn, int color,
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
     int drawflag = 0;
 
-    TridentSync(pScrn);
-
     REPLICATE(color);
     TGUI_FMIX(XAAPatternROP[rop]);
     if (pTrident->Chipset == PROVIDIA9685 ||
@@ -514,8 +506,6 @@ TridentSetupForMono8x8PatternFill(ScrnInfoPtr pScrn,
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
     int drawflag = 0;
 
-    TridentSync(pScrn);
-
     REPLICATE(fg);
     if (pTrident->Chipset == PROVIDIA9685 ||
         pTrident->Chipset == CYBER9388)
@@ -574,8 +564,6 @@ TridentSetupForColor8x8PatternFill(ScrnInfoPtr pScrn,
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
     int drawflag = 0;
 
-    TridentSync(pScrn);
-
     REPLICATE(transparency_color);
     if (transparency_color != -1) {
     	if (pTrident->Chipset == PROVIDIA9685 ||
@@ -619,8 +607,6 @@ TridentSetupForScanlineCPUToScreenColorExpandFill(
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
     int drawflag = SRCMONO;
 
-    TridentSync(pScrn);
-
     REPLICATE(fg);
     TGUI_FCOLOUR(fg);
     if (bg == -1) {
diff --git a/src/trident_bank.c b/src/trident_bank.c
index 2b1db07..eba91bb 100644
--- a/src/trident_bank.c
+++ b/src/trident_bank.c
@@ -21,7 +21,7 @@
  *
  * Author:  Alan Hourihane, alanh@fairlite.demon.co.uk
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_bank.c,v 1.5 2003/09/05 22:07:28 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_bank.c,v 1.4 2000/12/07 16:48:04 alanh Exp $ */
 
 /* All drivers should typically include these */
 #include "xf86.h"
diff --git a/src/trident_dac.c b/src/trident_dac.c
index c738842..da68f93 100644
--- a/src/trident_dac.c
+++ b/src/trident_dac.c
@@ -21,7 +21,7 @@
  *
  * Author:  Alan Hourihane, alanh@fairlite.demon.co.uk
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c,v 1.80 2004/01/21 22:31:54 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c,v 1.79 2003/11/03 05:11:42 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/trident_dga.c b/src/trident_dga.c
index eed60f4..2c06c78 100644
--- a/src/trident_dga.c
+++ b/src/trident_dga.c
@@ -21,7 +21,7 @@
  *
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dga.c,v 1.5 2003/09/05 22:07:28 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dga.c,v 1.4 2002/10/08 22:14:11 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/trident_driver.c b/src/trident_driver.c
index cf05b72..b8256f1 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -28,7 +28,7 @@
  *	    Massimiliano Ghilardi, max@Linuz.sns.it, some fixes to the
  *				   clockchip programming code.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v 1.191 2004/01/21 22:51:19 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v 1.190 2004/01/21 22:31:54 alanh Exp $ */
 
 #include "xf1bpp.h"
 #include "xf4bpp.h"
diff --git a/src/trident_i2c.c b/src/trident_i2c.c
index 1fd23ad..83581d0 100644
--- a/src/trident_i2c.c
+++ b/src/trident_i2c.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_i2c.c,v 1.5 1999/10/13 20:02:30 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_i2c.c,v 1.2 1999/01/23 09:55:59 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/trident_regs.h b/src/trident_regs.h
index 0f03180..35f8940 100644
--- a/src/trident_regs.h
+++ b/src/trident_regs.h
@@ -21,7 +21,7 @@
  *
  * Author:  Alan Hourihane, alanh@fairlite.demon.co.uk
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h,v 1.28 2004/01/21 22:51:19 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h,v 1.27 2003/09/05 22:07:29 alanh Exp $ */
 
 #define DEBUG 1
 
diff --git a/src/trident_shadow.c b/src/trident_shadow.c
index 75b24d3..16afe78 100644
--- a/src/trident_shadow.c
+++ b/src/trident_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_shadow.c,v 1.3 2001/06/14 02:23:50 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_shadow.c,v 1.2 2000/11/16 19:45:01 eich Exp $ */
 
 /*
    Copyright (c) 1999, 2000 The XFree86 Project Inc. 
diff --git a/src/trident_tv.c b/src/trident_tv.c
index c07f8b8..0ba8fa9 100644
--- a/src/trident_tv.c
+++ b/src/trident_tv.c
@@ -2,7 +2,7 @@
  * VIA TV additions
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_tv.c,v 1.2 2003/04/21 20:42:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_tv.c,v 1.1 2003/04/15 22:13:43 alanh Exp $ */
 
 #include "xf86_ansic.h"
 #include "trident.h"
diff --git a/src/trident_video.c b/src/trident_video.c
index c5a65c6..9659e58 100644
--- a/src/trident_video.c
+++ b/src/trident_video.c
@@ -21,7 +21,7 @@
  *
  * Author:  Alan Hourihane, alanh@fairlite.demon.co.uk
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 1.46 2004/01/21 22:51:19 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 1.45 2003/11/10 18:22:34 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/tridenthelper.c b/src/tridenthelper.c
index 6398858..08cbb91 100644
--- a/src/tridenthelper.c
+++ b/src/tridenthelper.c
@@ -21,7 +21,7 @@
  *
  * Author:  Alan Hourihane, alanh@fairlite.demon.co.uk
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridenthelper.c,v 1.21 2003/09/05 22:07:29 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridenthelper.c,v 1.20 2001/10/28 03:33:52 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/tridentramdac.c b/src/tridentramdac.c
index 80b658b..6b7584a 100644
--- a/src/tridentramdac.c
+++ b/src/tridentramdac.c
@@ -24,7 +24,7 @@
  * TridentOutIndReg() and TridentInIndReg() are used to access 
  * the indirect Trident RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridentramdac.c,v 1.5 2003/09/05 22:07:29 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridentramdac.c,v 1.4 2000/12/07 16:48:06 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/tvga_dac.c b/src/tvga_dac.c
index 43a84f9..ee81002 100644
--- a/src/tvga_dac.c
+++ b/src/tvga_dac.c
@@ -21,7 +21,7 @@
  *
  * Author:  Alan Hourihane, alanh@fairlite.demon.co.uk
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tvga_dac.c,v 1.8 2003/11/03 05:11:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tvga_dac.c,v 1.7tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/xp_accel.c b/src/xp_accel.c
index 44dc407..f543d87 100644
--- a/src/xp_accel.c
+++ b/src/xp_accel.c
@@ -23,7 +23,7 @@
  * 
  * BladeXP accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/xp_accel.c,v 1.7 2004/01/21 22:57:34 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/xp_accel.c,v 1.6 2003/10/30 13:38:02 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -257,8 +257,6 @@ XPSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
     int dst = 0;
 
-    XPSync(pScrn);
-
     pTrident->BltScanDirection = 0;
     if (xdir < 0) pTrident->BltScanDirection |= XNEG;
     if (ydir < 0) pTrident->BltScanDirection |= YNEG;
@@ -301,8 +299,6 @@ XPSetupForSolidLine(ScrnInfoPtr pScrn, int color,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    XPSync(pScrn);
-
     pTrident->BltScanDirection = 0;
     REPLICATE(color);
     TGUI_FMIX(XAAPatternROP[rop]);
@@ -340,8 +336,6 @@ XPSubsequentSolidHorVertLine(
 ){
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    XPSync(pScrn);
-
     TGUI_DRAWFLAG(SOLIDFILL);
     if (dir == DEGREES_0) {
     	XP_DIM_XY(len,1);
@@ -426,8 +420,6 @@ XPSetupForFillRectSolid(ScrnInfoPtr pScrn, int color,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    XPSync(pScrn);
-
     REPLICATE(color);
     TGUI_FMIX(XAAPatternROP[rop]);
     MMIO_OUT32(pTrident->IOBase, 0x2158, color);
@@ -509,8 +501,6 @@ XPSetupForMono8x8PatternFill(ScrnInfoPtr pScrn,
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
     int drawflag = 0;
 
-    XPSync(pScrn);
-
     REPLICATE(fg);
     MMIO_OUT32(pTrident->IOBase, 0x2158, fg);