b29c861b4d
Tested only on x86 so far due to problems installing dependencies on build cluster. Based on XFree86-4-Server originally, but I decided the history wasn't worth keeping that much as a lot has been changed.
87 lines
3.4 KiB
Text
87 lines
3.4 KiB
Text
--- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes 2003-01-08 04:28:57.000000000 -0500
|
|
+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2003-01-08 05:28:02.000000000 -0500
|
|
@@ -457,21 +457,34 @@
|
|
#define PCI_CHIP_TRIO64V2_DXGX 0x8901
|
|
#define PCI_CHIP_PLATO_PX 0x8902
|
|
#define PCI_CHIP_Trio3D 0x8904
|
|
-#define PCI_CHIP_Trio3D_2X 0x8A13
|
|
#define PCI_CHIP_VIRGE_DXGX 0x8A01
|
|
#define PCI_CHIP_VIRGE_GX2 0x8A10
|
|
+#define PCI_CHIP_Trio3D_2X 0x8A13
|
|
#define PCI_CHIP_SAVAGE3D 0x8A20
|
|
#define PCI_CHIP_SAVAGE3D_MV 0x8A21
|
|
#define PCI_CHIP_SAVAGE4 0x8A22
|
|
-#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_VIRGE_MX 0x8C01
|
|
+#define PCI_CHIP_VIRGE_MXPLUS 0x8C02
|
|
+#define PCI_CHIP_VIRGE_MXP 0x8C03
|
|
#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
|
|
+#define PCI_CHIP_SUPSAV_MX128 0x8C22
|
|
+#define PCI_CHIP_SUPSAV_MX64 0x8C24
|
|
+#define PCI_CHIP_SUPSAV_MX64C 0x8C26
|
|
+#define PCI_CHIP_SUPSAV_IX128SDR 0x8C2A
|
|
+#define PCI_CHIP_SUPSAV_IX128DDR 0x8C2B
|
|
+#define PCI_CHIP_SUPSAV_IX64SDR 0x8C2C
|
|
+#define PCI_CHIP_SUPSAV_IX64DDR 0x8C2D
|
|
+#define PCI_CHIP_SUPSAV_IXCSDR 0x8C2E
|
|
+#define PCI_CHIP_SUPSAV_IXCDDR 0x8C2F
|
|
+#define PCI_CHIP_S3TWISTER_P 0x8D01
|
|
+#define PCI_CHIP_S3TWISTER_K 0x8D02
|
|
+#define PCI_CHIP_PROSAVAGE_DDR 0x8D03
|
|
+#define PCI_CHIP_PROSAVAGE_DDRK 0x8D04
|
|
#define PCI_CHIP_SAVAGE2000 0x9102
|
|
|
|
/* ARK Logic */
|
|
--- programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes 2003-01-08 05:31:06.000000000 -0500
|
|
+++ programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 2003-01-08 05:31:25.000000000 -0500
|
|
@@ -3,30 +3,6 @@
|
|
#ifndef _SAVAGE_REGS_H
|
|
#define _SAVAGE_REGS_H
|
|
|
|
-/* These are here until xf86PciInfo.h is updated. */
|
|
-
|
|
-#ifndef PCI_CHIP_S3TWISTER_P
|
|
-#define PCI_CHIP_S3TWISTER_P 0x8d01
|
|
-#endif
|
|
-#ifndef PCI_CHIP_S3TWISTER_K
|
|
-#define PCI_CHIP_S3TWISTER_K 0x8d02
|
|
-#endif
|
|
-#ifndef PCI_CHIP_SUPSAV_MX128
|
|
-#define PCI_CHIP_SUPSAV_MX128 0x8c22
|
|
-#define PCI_CHIP_SUPSAV_MX64 0x8c24
|
|
-#define PCI_CHIP_SUPSAV_MX64C 0x8c26
|
|
-#define PCI_CHIP_SUPSAV_IX128SDR 0x8c2a
|
|
-#define PCI_CHIP_SUPSAV_IX128DDR 0x8c2b
|
|
-#define PCI_CHIP_SUPSAV_IX64SDR 0x8c2c
|
|
-#define PCI_CHIP_SUPSAV_IX64DDR 0x8c2d
|
|
-#define PCI_CHIP_SUPSAV_IXCSDR 0x8c2e
|
|
-#define PCI_CHIP_SUPSAV_IXCDDR 0x8c2f
|
|
-#endif
|
|
-#ifndef PCI_CHIP_PROSAVAGE_DDR
|
|
-#define PCI_CHIP_PROSAVAGE_DDR 0x8d03
|
|
-#define PCI_CHIP_PROSAVAGE_DDRK 0x8d04
|
|
-#endif
|
|
-
|
|
#define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
|
|
|
|
#define S3_SAVAGE4_SERIES(chip) ((chip==S3_SAVAGE4) || (chip==S3_PROSAVAGE))
|
|
--- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes 2003-01-08 06:28:59.000000000 -0500
|
|
+++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2003-01-08 06:33:02.000000000 -0500
|
|
@@ -123,8 +123,8 @@
|
|
{ PCI_CHIP_SAVAGE_IX, "Savage/IX" },
|
|
{ PCI_CHIP_PROSAVAGE_PM, "ProSavage PM133" },
|
|
{ PCI_CHIP_PROSAVAGE_KM, "ProSavage KM133" },
|
|
- { PCI_CHIP_S3TWISTER_P, "ProSavage PN133" },
|
|
- { PCI_CHIP_S3TWISTER_K, "ProSavage KN133" },
|
|
+ { PCI_CHIP_S3TWISTER_P, "Twister PN133" },
|
|
+ { PCI_CHIP_S3TWISTER_K, "Twister KN133" },
|
|
{ PCI_CHIP_SUPSAV_MX128, "SuperSavage/MX 128" },
|
|
{ PCI_CHIP_SUPSAV_MX64, "SuperSavage/MX 64" },
|
|
{ PCI_CHIP_SUPSAV_MX64C, "SuperSavage/MX 64C" },
|