xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/ati_pciids_gen.h              |    2 ++
 src/pcidb/ati_pciids.csv          |    2 ++
 src/radeon_chipinfo_gen.h         |    2 ++
 src/radeon_chipset_gen.h          |    2 ++
 src/radeon_pci_chipset_gen.h      |    2 ++
 src/radeon_pci_device_match_gen.h |    2 ++
 6 files changed, 12 insertions(+)

New commits:
commit e8e2367b66d9a4f5977d95f52b37cdbad75e409a
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Mar 19 20:09:32 2009 -0400

    Add new pci ids

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index d532f16..8aad4be 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -429,3 +429,5 @@
 #define PCI_CHIP_RS780_9612 0x9612
 #define PCI_CHIP_RS780_9613 0x9613
 #define PCI_CHIP_RS780_9614 0x9614
+#define PCI_CHIP_RS780_9615 0x9615
+#define PCI_CHIP_RS780_9616 0x9616
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 4d4e625..e027c65 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -430,3 +430,5 @@
 "0x9612","RS780_9612","RS780",,1,,,1,"ATI Radeon HD 3200 Graphics"
 "0x9613","RS780_9613","RS780",,1,,,1,"ATI Radeon 3100 Graphics"
 "0x9614","RS780_9614","RS780",,1,,,1,"ATI Radeon HD 3300 Graphics"
+"0x9615","RS780_9615","RS780",,1,,,1,"ATI Radeon HD 3200 Graphics"
+"0x9616","RS780_9616","RS780",,1,,,1,"ATI Radeon HD 3000 Graphics"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index eb2df17..97b601f 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -349,4 +349,6 @@ RADEONCardInfo RADEONCards[] = {
  { 0x9612, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
  { 0x9613, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
  { 0x9614, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
+ { 0x9615, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
+ { 0x9616, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
 };
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 3c86ae6..bc5bd1a 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -349,5 +349,7 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_RS780_9612, "ATI Radeon HD 3200 Graphics" },
   { PCI_CHIP_RS780_9613, "ATI Radeon 3100 Graphics" },
   { PCI_CHIP_RS780_9614, "ATI Radeon HD 3300 Graphics" },
+  { PCI_CHIP_RS780_9615, "ATI Radeon HD 3200 Graphics" },
+  { PCI_CHIP_RS780_9616, "ATI Radeon HD 3000 Graphics" },
   { -1,                 NULL }
 };
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 31b032a..7749ea7 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -349,5 +349,7 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_RS780_9612, PCI_CHIP_RS780_9612, RES_SHARED_VGA },
  { PCI_CHIP_RS780_9613, PCI_CHIP_RS780_9613, RES_SHARED_VGA },
  { PCI_CHIP_RS780_9614, PCI_CHIP_RS780_9614, RES_SHARED_VGA },
+ { PCI_CHIP_RS780_9615, PCI_CHIP_RS780_9615, RES_SHARED_VGA },
+ { PCI_CHIP_RS780_9616, PCI_CHIP_RS780_9616, RES_SHARED_VGA },
  { -1,                 -1,                 RES_UNDEFINED }
 };
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index b310ce8..83f15a7 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -349,5 +349,7 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_RS780_9612, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RS780_9613, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RS780_9614, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RS780_9615, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RS780_9616, 0 ),
  { 0, 0, 0 }
 };