diff -ur xc-X3331servonly-xtt/config/cf/xf86site.def xc/config/cf/xf86site.def --- xc-X3331servonly-xtt/config/cf/xf86site.def Sun Nov 8 20:19:11 1998 +++ xc/config/cf/xf86site.def Wed Jun 30 20:03:27 1999 @@ -163,7 +163,8 @@ * * The following servers are supported in Intel x86 platforms * -#define XF86SVGAServer NO + */ +#define XF86SVGAServer YES #define XF86VGA16Server NO #define XF86VGA16DualServer NO #define XF86MonoServer NO @@ -180,7 +181,8 @@ #define XF86I128Server NO #define XF86GLINTServer NO #define XF86FBDevServer NO - */ + +#define ServerToInstall XF86_SVGA /* * Which servers do you wish to build, you can save a lot of disk space @@ -260,7 +262,6 @@ * #define ServerToInstall XF86_S3 */ - /* * Server configuration parameters. The defaults are shown here: diff -ur xc-X3331servonly-xtt/config/cf/xttsite.def xc/config/cf/xttsite.def --- xc-X3331servonly-xtt/config/cf/xttsite.def Fri Jul 23 15:29:00 1999 +++ xc/config/cf/xttsite.def Wed Jun 30 19:56:48 1999 @@ -6,7 +6,7 @@ /* * If you don't have FreeType library, uncomment this. * -#define HasFreeType NO +#define HasFreeType YES */ /* @@ -23,7 +23,7 @@ * To prevend building XFree86 with TrueType font support by X-TrueType, * uncomment this. * -#define BuildXTrueType NO +#define BuildXTrueType YES */ /* diff -ur xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/SuperProbe/PCI.h xc/programs/Xserver/hw/xfree86/SuperProbe/PCI.h --- xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/SuperProbe/PCI.h Fri Jul 23 14:37:15 1999 +++ xc/programs/Xserver/hw/xfree86/SuperProbe/PCI.h Wed Jun 30 19:26:20 1999 @@ -289,6 +289,7 @@ #define PCI_CHIP_9388 0x9388 #define PCI_CHIP_9397 0x9397 #define PCI_CHIP_9520 0x9520 +#define PCI_CHIP_9525 0x9525 #define PCI_CHIP_9750 0x9750 #define PCI_CHIP_9850 0x9850 diff -ur xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/SuperProbe/Print.c xc/programs/Xserver/hw/xfree86/SuperProbe/Print.c --- xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/SuperProbe/Print.c Fri Jul 23 14:37:15 1999 +++ xc/programs/Xserver/hw/xfree86/SuperProbe/Print.c Wed Jun 30 19:32:00 1999 @@ -154,6 +154,7 @@ "Trident Cyber9385-1", "Trident Cyber9388", "Trident Cyber9388-1", "Trident Cyber9397", "Trident Cyber9520", + "Trident Cyber9525", "Trident 3DImage975", "Trident 3DImage985", }, /* Tseng */ { "Tseng (chipset unknown)", "Tseng ET3000", "Tseng ET4000", diff -ur xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/SuperProbe/Probe.h xc/programs/Xserver/hw/xfree86/SuperProbe/Probe.h --- xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/SuperProbe/Probe.h Fri Jul 23 14:37:15 1999 +++ xc/programs/Xserver/hw/xfree86/SuperProbe/Probe.h Wed Jun 30 19:29:30 1999 @@ -620,8 +620,9 @@ #define CHIP_TVGA9388_1 SVGA_TYPE(V_TRIDENT,25) /* Trident Cyber9388-1 */ #define CHIP_TVGA9397 SVGA_TYPE(V_TRIDENT,26) /* Trident Cyber9397 */ #define CHIP_TVGA9520 SVGA_TYPE(V_TRIDENT,27) /* Trident Cyber9520 */ -#define CHIP_TVGA9750 SVGA_TYPE(V_TRIDENT,28) /* Trident 3DImage975 */ -#define CHIP_TVGA9850 SVGA_TYPE(V_TRIDENT,29) /* Trident 3DImage985 */ +#define CHIP_TVGA9525 SVGA_TYPE(V_TRIDENT,28) /* Trident Cyber9525 */ +#define CHIP_TVGA9750 SVGA_TYPE(V_TRIDENT,29) /* Trident 3DImage975 */ +#define CHIP_TVGA9850 SVGA_TYPE(V_TRIDENT,30) /* Trident 3DImage985 */ #define CHIP_SIS_UNK SVGA_TYPE(V_SIS,0) /* SiS unknown */ #define CHIP_SIS86C201 SVGA_TYPE(V_SIS,1) /* SiS SG86C201 */ #define CHIP_SIS86C202 SVGA_TYPE(V_SIS,2) /* SiS SG86C202 */ diff -ur xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/SuperProbe/Trident.c xc/programs/Xserver/hw/xfree86/SuperProbe/Trident.c --- xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/SuperProbe/Trident.c Sun Nov 1 05:12:35 1998 +++ xc/programs/Xserver/hw/xfree86/SuperProbe/Trident.c Thu Mar 18 21:00:52 1999 @@ -134,6 +134,9 @@ case PCI_CHIP_9520: *Chipset = CHIP_TVGA9520; break; + case PCI_CHIP_9525: + *Chipset = CHIP_TVGA9525; + break; case PCI_CHIP_9750: *Chipset = CHIP_TVGA9750; break; diff -ur xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c --- xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c Fri Jul 23 14:37:16 1999 +++ xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c Wed Jun 30 19:48:46 1999 @@ -50,6 +50,9 @@ * * Massimiliano Ghilardi, max@Linuz.sns.it, some fixes to the * clockchip programming code. + * + * Matt Gumbley, mgumbley@enigmadata.co.uk, added Cyber 9525 + * detection */ /* $XConsortium: t89_driver.c /main/33 1996/10/28 05:31:03 kaleb $ */ @@ -396,6 +399,7 @@ "tgui9660", "tgui9680", "tgui9682", "tgui9685", "cyber9382", "cyber9385", "cyber9388", "cyber9397", "cyber9520", + "cyber9525", "3dimage975", "3dimage985" }; @@ -620,11 +624,17 @@ } else if (!StrCaseCmp(vga256InfoRec.chipset, TVGA8900Ident(25))) { - TVGAchipset = IMAGE975; + TVGAchipset = CYBER9525; + IsCyber = TRUE; NewClockCode = TRUE; } else if (!StrCaseCmp(vga256InfoRec.chipset, TVGA8900Ident(26))) { + TVGAchipset = IMAGE975; + NewClockCode = TRUE; + } + else if (!StrCaseCmp(vga256InfoRec.chipset, TVGA8900Ident(27))) + { TVGAchipset = IMAGE985; NewClockCode = TRUE; } @@ -781,6 +791,10 @@ TVGAchipset = CYBER9520; TVGAName = "Cyber9520"; break; + case PCI_CHIP_9525: + TVGAchipset = CYBER9525; + TVGAName = "Cyber9525"; + break; case PCI_CHIP_9750: TVGAchipset = IMAGE975; TVGAName = "3DImage975"; @@ -895,6 +909,7 @@ case CYBER9388: case CYBER9397: case CYBER9520: + case CYBER9525: if(((TVGAchipset != CYBER9388) && (TVGAchipset != CYBER9397)) || OFLG_ISSET(OPTION_ACCEL, &vga256InfoRec.options)) @@ -952,6 +967,11 @@ break; case 0x40: case 0x41: /* Guessing */ + REV = "Cyber 9525"; + TVGAchipset = CYBER9525; + NewClockCode = TRUE; + IsCyber = TRUE; + break; case 0x42: /* Guessing */ case 0x43: REV = "9382"; diff -ur xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.h xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.h --- xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.h Sun Nov 1 05:15:33 1998 +++ xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.h Wed Jun 30 19:36:11 1999 @@ -56,8 +56,9 @@ #define CYBER9388 22 #define CYBER9397 23 #define CYBER9520 24 -#define IMAGE975 25 -#define IMAGE985 26 +#define CYBER9525 25 +#define IMAGE975 26 +#define IMAGE985 27 #define IsTGUI9440 (TVGAchipset == TGUI9440AGi) #define IsTGUI9660 (TVGAchipset == TGUI9660) @@ -68,10 +69,12 @@ (TVGAchipset == CYBER9385) || \ (TVGAchipset == CYBER9388) || \ (TVGAchipset == CYBER9520) || \ + (TVGAchipset == CYBER9525) || \ (TVGAchipset == CYBER9397)) #define Is3Dchip ((TVGAchipset == CYBER9397) || \ (TVGAchipset == CYBER9388) || \ (TVGAchipset == CYBER9520) || \ + (TVGAchipset == CYBER9525) || \ (TVGAchipset == IMAGE975) || \ (TVGAchipset == IMAGE985)) @@ -105,6 +108,7 @@ 230000, 230000, 230000, + 230000, }; int tridentClockLimit16bpp[] = { @@ -135,6 +139,7 @@ 230000, 230000, 230000, + 230000, }; int tridentClockLimit24bpp[] = { @@ -165,6 +170,7 @@ 115000, 115000, 115000, + 115000, }; int tridentClockLimit32bpp[] = { @@ -192,6 +198,7 @@ 70000, 85000, 85000, + 115000, 115000, 115000, 115000, diff -ur xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/vga256/vga/vgaPCI.h xc/programs/Xserver/hw/xfree86/vga256/vga/vgaPCI.h --- xc-X3331servonly-xtt/programs/Xserver/hw/xfree86/vga256/vga/vgaPCI.h Fri Nov 6 04:26:25 1998 +++ xc/programs/Xserver/hw/xfree86/vga256/vga/vgaPCI.h Thu Mar 18 21:04:45 1999 @@ -111,6 +111,7 @@ #define PCI_CHIP_9388 0x9388 #define PCI_CHIP_9397 0x9397 #define PCI_CHIP_9520 0x9520 +#define PCI_CHIP_9525 0x9525 #define PCI_CHIP_9750 0x9750 #define PCI_CHIP_9850 0x9850 @@ -336,6 +337,7 @@ {PCI_CHIP_9388, "Cyber 9388"}, {PCI_CHIP_9397, "Cyber 9397"}, {PCI_CHIP_9520, "Cyber 9520"}, + {PCI_CHIP_9525, "Cyber 9525"}, {PCI_CHIP_9750, "3DImage975"}, {PCI_CHIP_9850, "3DImage985"}, {0x0000, NULL}}},