rpms/xorg-x11-drv-avivo/devel x2300.patch,NONE,1.1

[Kristian Høgsberg (krh)]

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-avivo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30770

Added Files:
	x2300.patch 
Log Message:
Forgot to add patch...

x2300.patch:

--- NEW FILE x2300.patch ---
diff -up xf86-video-avivo-20070918/xorg/avivo_chipset.c~ xf86-video-avivo-20070918/xorg/avivo_chipset.c
--- xf86-video-avivo-20070918/xorg/avivo_chipset.c~	2007-09-18 10:14:54.000000000 -0400
+++ xf86-video-avivo-20070918/xorg/avivo_chipset.c	2007-10-04 18:05:14.000000000 -0400
@@ -356,6 +356,10 @@ const struct pci_id_match avivo_device_m
         PCI_VENDOR_ATI, 0x7244, PCI_MATCH_ANY, PCI_MATCH_ANY,
         0x00030000, 0x00ffffff, 0
     },
+    {
+        PCI_VENDOR_ATI, 0x7188, PCI_MATCH_ANY, PCI_MATCH_ANY,
+        0x00030000, 0x00ffffff, 0
+    },
 
     { 0, 0, 0 },
 };
@@ -394,6 +398,7 @@ SymTabRec avivo_chips[] = {
     { PCI_CHIP_M58_7102, "M58 (ATI Mobility Radeon X1800)" },
     { PCI_CHIP_M58_7101, "M58 (ATI Mobility Radeon X1800 XT)" },
     { PCI_CHIP_M58_7284, "M58 (ATI Mobility Radeon X1900)" },
+    { PCI_CHIP_M64_7188, "M64-S (ATI Mobility Radeon X2300)" },
     { PCI_CHIP_RS690_791E, "RS690 (ATI Radeon X1200 Series)" },
     { PCI_CHIP_RS690M_791F, "RS690M (ATI Radeon X1200 Series)" },
     { PCI_CHIP_R580_7288, "R580 (ATI Radeon X1950 GT)" },
@@ -480,6 +485,7 @@ PciChipsets avivo_pci_chips[] = {
     { PCI_CHIP_M58_7102, PCI_CHIP_M58_7102, RES_SHARED_VGA },
     { PCI_CHIP_M58_7101, PCI_CHIP_M58_7101, RES_SHARED_VGA },
     { PCI_CHIP_M58_7284, PCI_CHIP_M58_7284, RES_SHARED_VGA },
+    { PCI_CHIP_M64_7188, PCI_CHIP_M64_7188, RES_SHARED_VGA },
     { PCI_CHIP_RS690_791E, PCI_CHIP_RS690_791E, RES_SHARED_VGA },
     { PCI_CHIP_RS690M_791F, PCI_CHIP_RS690M_791F, RES_SHARED_VGA },
     { PCI_CHIP_R580_7288, PCI_CHIP_R580_7288, RES_SHARED_VGA },
@@ -571,6 +577,7 @@ static struct avivo_chipset_family chips
     { PCI_CHIP_M58_7102, CHIP_FAMILY_M58 },
     { PCI_CHIP_M58_7101, CHIP_FAMILY_M58 },
     { PCI_CHIP_M58_7284, CHIP_FAMILY_M58 },
+    { PCI_CHIP_M64_7188, CHIP_FAMILY_M64 },
     { PCI_CHIP_RS690_791E, CHIP_FAMILY_RS690 },
     { PCI_CHIP_RS690M_791F, CHIP_FAMILY_RS690M },
     { PCI_CHIP_R580_7288, CHIP_FAMILY_R580 },
diff -up xf86-video-avivo-20070918/include/avivo_chipset.h~ xf86-video-avivo-20070918/include/avivo_chipset.h
--- xf86-video-avivo-20070918/include/avivo_chipset.h~	2007-09-18 10:14:54.000000000 -0400
+++ xf86-video-avivo-20070918/include/avivo_chipset.h	2007-10-04 18:04:48.000000000 -0400
@@ -60,6 +60,7 @@
 #define PCI_CHIP_M58_7102              0x7102
 #define PCI_CHIP_M58_7101              0x7101
 #define PCI_CHIP_M58_7284              0x7284
+#define PCI_CHIP_M64_7188              0x7188
 #define PCI_CHIP_RS690_791E            0x791E
 #define PCI_CHIP_RS690M_791F           0x791F
 #define PCI_CHIP_R580_7288             0x7288
@@ -124,6 +125,7 @@ enum avivo_chip_type {
     CHIP_FAMILY_M54,
     CHIP_FAMILY_M56,
     CHIP_FAMILY_M58,
+    CHIP_FAMILY_M64,
     CHIP_FAMILY_RS690,
     CHIP_FAMILY_RS690M,
     CHIP_FAMILY_RS600,