Import of XFree86 4.0.1gX_4_0_1h

6 files changed, 47 insertions, 21 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/common/Imakefile b/xc/programs/Xserver/hw/xfree86/common/Imakefile
index 9ac94f282..35ec8419a 100644
--- a/xc/programs/Xserver/hw/xfree86/common/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/common/Imakefile
@@ -4,7 +4,7 @@ XCOMM $XConsortium: Imakefile /main/34 1996/10/27 11:05:08 kaleb $
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common/Imakefile,v 3.123 2000/11/03 18:46:05 eich Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common/Imakefile,v 3.124 2000/12/01 00:24:33 dawes Exp $
 
 
 
@@ -168,11 +168,13 @@ OFILES = \
      OSNAME = OSName
    OSVENDOR = OSVendor
   OSNAMEDEF = -DOSNAME='" $(OSNAME)"' -DOSVENDOR='" $(OSVENDOR)"'
+#if defined(XFree86CustomVersion)
+CUSTOMVERSION = XFree86CustomVersion
+ CUSTOMVERDEF = -DXF86_CUSTOM_VERSION='$(CUSTOMVERSION)'
+#endif
 #if defined(BuilderString)
   BUILDERSTRING = BuilderString
   BUILDERMSG = -DBUILDERSTRING='$(BUILDERSTRING)'
-#else
-  BUILDERMSG =
 #endif
 CONSDEFINES = XFree86ConsoleDefines
 EXP_DEFINES = -DEXPIRY_TIME=XF86ServerExpiry $(EXP_FORCE_DEFINES)
@@ -190,7 +192,7 @@ XCONFIGUREDEFINES = -DXF86CONFIGFILE='"$(XF86CONFIGFILE)"'
 AllTarget($(OFILES))
 
 SpecialCObjectRule(xf86Bus,NullParameter,$(BUGMSG) $(VGAINCLUDES))
-SpecialCObjectRule(xf86Init,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(BUGMSG) $(EXT_DEFINES) $(BETADEFS))
+SpecialCObjectRule(xf86Init,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(BUGMSG) $(CUSTOMVERDEF) $(EXT_DEFINES) $(BETADEFS))
 SpecialCObjectRule(xf86Events,$(ICONFIGFILES),$(EXT_DEFINES))
 SpecialCObjectRule(xf86Globals,$(ICONFIGFILES),$(EXT_DEFINES) $(MODPATHDEFINES) $(LOGDEFINES))
 SpecialCObjectRule(xf86Config,$(ICONFIGFILES),$(XCONFIGDEFINES))
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Configure.c b/xc/programs/Xserver/hw/xfree86/common/xf86Configure.c
index ae6e3dd66..2885b824b 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Configure.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Configure.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.44 2000/11/18 19:37:09 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.45 2000/12/01 21:03:32 paulo Exp $ */
 /*
  * Copyright 2000 by Alan Hourihane, Sychdyn, North Wales.
  *
@@ -348,6 +348,7 @@ configureScreenSection (int screennum)
 	display = xf86confmalloc(sizeof(XF86ConfDisplayRec));
     	memset((XF86ConfDisplayPtr)display,0,sizeof(XF86ConfDisplayRec));
 	display->disp_depth = depths[i];
+	display->disp_black.red = display->disp_white.red = -1;
 	ptr->scrn_display_lst = (XF86ConfDisplayPtr)xf86addListItem(
 				     (glp)ptr->scrn_display_lst, (glp)display);
     }
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Helper.c b/xc/programs/Xserver/hw/xfree86/common/xf86Helper.c
index d6c1e4549..d3675e4fc 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Helper.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Helper.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.103 2000/11/18 19:37:09 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.105 2000/12/02 15:30:28 tsi Exp $ */
 
 /*
  * Copyright (c) 1997-1998 by The XFree86 Project, Inc.
@@ -1455,6 +1455,9 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
     confScreenPtr screensecptr;
     int i,j;
 
+    if (sectlist)
+	*sectlist = NULL;
+
     if (xf86DoProbe) return 1;
   
     if (xf86DoConfigure && xf86DoConfigurePass1) return 1;
@@ -1645,7 +1648,7 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
 	for (i = 0; i < allocatedInstances; i++) {
 	    if (instances[i].foundHW) {
 		actualcards++;
-	    	pGDev = xf86AddDeviceToConfigure(driverName,
+	    	pGDev = xf86AddDeviceToConfigure(drvp->driverName,
 						 instances[i].pci, -1);
 		if (pGDev) {
 		   /*
@@ -1902,7 +1905,7 @@ xf86MatchIsaInstances(const char *driverName, SymTabPtr chipsets,
     if (xf86DoProbe || (xf86DoConfigure && xf86DoConfigurePass1)) {
 	if (FindIsaDevice &&
 	    ((foundChip = (*FindIsaDevice)(NULL)) != -1)) {
-	    xf86AddDeviceToConfigure(driverName, NULL, foundChip);
+	    xf86AddDeviceToConfigure(drvp->driverName, NULL, foundChip);
 	    return 1;
 	}
 	return 0;
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Init.c b/xc/programs/Xserver/hw/xfree86/common/xf86Init.c
index 68af62445..049ebe66c 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Init.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.172 2000/11/27 05:06:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.173 2000/12/01 00:24:33 dawes Exp $ */
 
 /*
  * Copyright 1991-1999 by The XFree86 Project, Inc.
@@ -1568,7 +1568,11 @@ xf86PrintBanner()
     "please check the latest version in the XFree86 CVS repository\n"
     "(http://www.XFree86.Org/cvs)\n");
 #endif
-  ErrorF("\nXFree86 Version%s/ X Window System\n", XF86_VERSION);
+  ErrorF("\nXFree86 Version%s", XF86_VERSION);
+#ifdef XF86_CUSTOM_VERSION
+  ErrorF("(%s) ", XF86_CUSTOM_VERSION);
+#endif
+  ErrorF("/ X Window System\n");
   ErrorF("(protocol Version %d, revision %d, vendor release %d)\n",
          X_PROTOCOL, X_PROTOCOL_REVISION, VENDOR_RELEASE );
   ErrorF("Release Date: %s\n", XF86_DATE);
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h b/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
index e933a3017..6cd7d1278 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.79 2000/11/29 09:16:17 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.82 2000/12/04 18:49:52 dawes Exp $ */
 /*
  * PCI Probe
  *
@@ -324,6 +324,8 @@
 #define PCI_CHIP_8420		0x8420
 #define PCI_CHIP_8500		0x8500
 #define PCI_CHIP_8520		0x8520
+#define PCI_CHIP_8600		0x8600
+#define PCI_CHIP_8620		0x8620
 #define PCI_CHIP_9320		0x9320
 #define PCI_CHIP_9388		0x9388
 #define PCI_CHIP_9397		0x9397
@@ -534,13 +536,19 @@
 #define PCI_CHIP_Trio3D_2X	0x8A13
 #define PCI_CHIP_VIRGE_DXGX	0x8A01
 #define PCI_CHIP_VIRGE_GX2	0x8A10
-#define PCI_CHIP_Savage3D	0x8A20
-#define PCI_CHIP_Savage3D_MV	0x8A21
-#define PCI_CHIP_Savage4	0x8A22
-#define PCI_CHIP_Savage2000	0x9102
+#define PCI_CHIP_SAVAGE3D	0x8A20
+#define PCI_CHIP_SAVAGE3D_MV	0x8A21
+#define PCI_CHIP_SAVAGE4	0x8A22
+#define PCI_CHIP_SAVAGE2000	0x9102
 #define PCI_CHIP_VIRGE_MX	0x8C01
 #define PCI_CHIP_VIRGE_MXPLUS	0x8C01
 #define PCI_CHIP_VIRGE_MXP	0x8C03
+#define PCI_CHIP_PROSAVAGE_PM	0x8A25
+#define PCI_CHIP_PROSAVAGE_KM	0x8A26
+#define PCI_CHIP_SAVAGE_MX_MV	0x8c10
+#define PCI_CHIP_SAVAGE_MX	0x8c11
+#define PCI_CHIP_SAVAGE_IX_MV	0x8c12
+#define PCI_CHIP_SAVAGE_IX	0x8c13
 
 /* ARK Logic */
 #define PCI_CHIP_1000PV		0xA091
@@ -905,6 +913,8 @@ static pciVendorDeviceInfo xf86PCIVendorInfoData[] = {
 				{PCI_CHIP_8420,		"CyberBlade/DSTN/i7",0},
 				{PCI_CHIP_8500,		"CyberBlade/i1",0},
 				{PCI_CHIP_8520,		"CyberBlade/DSTN/i1",0},
+				{PCI_CHIP_8600,		"CyberBlade/Ai1",0},
+				{PCI_CHIP_8620,		"CyberBlade/DSTN/Ai1",0},
 				{0x0000,		NULL,0}}},
 #ifdef VENDOR_INCLUDE_NONVIDEO
      {PCI_VENDOR_ALI, {
@@ -1383,10 +1393,16 @@ static pciVendorDeviceInfo xf86PCIVendorInfoData[] = {
 				{PCI_CHIP_VIRGE_VX,	"ViRGE/VX",0},
 				{PCI_CHIP_VIRGE_DXGX,	"ViRGE/DX or /GX",0},
 				{PCI_CHIP_VIRGE_GX2,	"ViRGE/GX2",0},
-				{PCI_CHIP_Savage3D,	"Savage3D (86E391)",0},
-				{PCI_CHIP_Savage3D_MV,	"Savage3D+MacroVision (86E390)",0},
-				{PCI_CHIP_Savage4,	"Savage4",0},
-				{PCI_CHIP_Savage2000,	"Savage2000",0},
+				{PCI_CHIP_SAVAGE3D,	"Savage3D (86E391)",0},
+				{PCI_CHIP_SAVAGE3D_MV,	"Savage3D+MacroVision (86E390)",0},
+				{PCI_CHIP_SAVAGE4,	"Savage4",0},
+				{PCI_CHIP_SAVAGE2000,	"Savage2000",0},
+				{PCI_CHIP_SAVAGE_MX,	"Savage/MX",0},
+				{PCI_CHIP_SAVAGE_MX_MV,	"Savage/MX-MV",0},
+				{PCI_CHIP_SAVAGE_IX,	"Savage/IX",0},
+				{PCI_CHIP_SAVAGE_IX_MV,	"Savage/IX-MV",0},
+				{PCI_CHIP_PROSAVAGE_PM,	"ProSavage PM133",0},
+				{PCI_CHIP_PROSAVAGE_KM,	"ProSavage KM133",0},
 				{PCI_CHIP_VIRGE_MX,	"ViRGE/MX",0},
 				{PCI_CHIP_VIRGE_MXPLUS,	"ViRGE/MX+",0},
 				{PCI_CHIP_VIRGE_MXP,	"ViRGE/MX+MV",0},
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c b/xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c
index 9b221349d..5f711f87b 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c
@@ -20,7 +20,7 @@
  * 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.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.3 2000/06/20 16:01:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.4 2000/12/01 15:28:10 dawes Exp $ */
 
 #include <ctype.h>
 #include <stdio.h>
@@ -436,7 +436,7 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
 	int actualcards = 0;
 	for (i = 0; i < allocatedInstances; i++) {
 	    actualcards++;
-	    pGDev = xf86AddBusDeviceToConfigure(driverName, BUS_SBUS,
+	    pGDev = xf86AddBusDeviceToConfigure(drvp->driverName, BUS_SBUS,
 						instances[i].sbus, -1);
 	    if (pGDev) {
 		/*