X Strike Force X.Org X11 SVN commit: r205 - in trunk/debian: . patches
Author: branden
Date: 2005-06-14 03:26:23 -0500 (Tue, 14 Jun 2005)
New Revision: 205
Removed:
trunk/debian/patches/042_savage_fix_pci_ids.diff
Modified:
trunk/debian/TODO
trunk/debian/patches/0000_backport_from_upstream.diff
Log:
Patch #042 has been committed upstream; move it to patch #0000.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-06-14 07:40:16 UTC (rev 204)
+++ trunk/debian/TODO 2005-06-14 08:26:23 UTC (rev 205)
@@ -97,7 +97,6 @@
039_mkfontdir_force_correct_perms.diff
040_extend_netmouse_support.diff
041_make_xcursor_icondir_configurable.diff
-042_savage_fix_pci_ids.diff
043_ati_r128_update_chip_identification.diff
044_chips_default_to_noaccel_on_69k.diff
045_chips_default_to_swcursor_on_69k.diff
Modified: trunk/debian/patches/0000_backport_from_upstream.diff
===================================================================
--- trunk/debian/patches/0000_backport_from_upstream.diff 2005-06-14 07:40:16 UTC (rev 204)
+++ trunk/debian/patches/0000_backport_from_upstream.diff 2005-06-14 08:26:23 UTC (rev 205)
@@ -9,6 +9,10 @@
elided so that they apply cleanly. (Also, the expanded CVS keywords seem
to lag the actual revision by one, so they are often misleading.)
+All patches are from freedesktop.org xorg CVS HEAD, since as of this
+writing (2005-06-14), there have been no commits to XORG-6_8-branch since
+X.Org 6.8.2 was released.
+
2004-11-07 Fabio M. Di Nitto <fabbione@fabbione.net>
* programs/Xserver/hw/dmx/config/Imakefile
@@ -45,6 +49,15 @@
Re-enable building of tdfx for ia64 and amd64, since libglide3 is
available there.
+2005-02-04 Felix Kuehling <fxkuehl@gmx.de>
+
+ * programs/Xserver/hw/xfree86/common/xf86PciInfo.h:
+ * programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c:
+ * programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h:
+ Applied patch (id=1354) by Mike A. Harris from bug #1901:
+ The attached patch updates a couple of PCI IDs for the Savage driver --
+ Debian/Ubuntu/Red Hat/Fedora.
+
2005-02-21 Matthieu Herrb <matthieu.herrb@laas.fr>
* extras/Xpm/lib/create.c:
@@ -241,6 +254,111 @@
# endif
#endif /*AMD64Arcitecture*/
+Index: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 30 Jul 2004 22:20:21 -0000 1.2
++++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 4 Feb 2005 01:14:49 -0000 1.3
+@@ -596,21 +596,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 */
+Index: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 10 Jan 2005 23:11:53 -0000 1.8
++++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 4 Feb 2005 01:14:49 -0000 1.9
+Index: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v
+retrieving revision 1.28
+retrieving revision 1.29
+@@ -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))
+diff -u -r1.28 -r1.29
+--- xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2 Feb 2005 04:58:27 -0000 1.28
++++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 4 Feb 2005 01:14:49 -0000 1.29
+@@ -121,8 +121,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" },
Index: xc/extras/Xpm/lib/create.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Xpm/lib/create.c,v
Deleted: trunk/debian/patches/042_savage_fix_pci_ids.diff
===================================================================
--- trunk/debian/patches/042_savage_fix_pci_ids.diff 2005-06-14 07:40:16 UTC (rev 204)
+++ trunk/debian/patches/042_savage_fix_pci_ids.diff 2005-06-14 08:26:23 UTC (rev 205)
@@ -1,93 +0,0 @@
-$Id$
-
-This patch by Mike A. Harris.
-
-Not submitted to XFree86.
-
---- xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes 2003-01-08 04:28:57.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2003-01-08 05:28:02.000000000 -0500
-@@ -641,21 +641,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 */
---- xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes 2003-01-08 05:31:06.000000000 -0500
-+++ xc/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))
---- xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes 2003-01-08 06:28:59.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2003-01-08 06:33:02.000000000 -0500
-@@ -121,8 +121,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" },
Reply to: