xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/ati_pciids_gen.h         |    6 ++++++
 src/pcidb/ati_pciids.csv     |    6 ++++++
 src/radeon.h                 |    1 +
 src/radeon_chipinfo_gen.h    |    6 ++++++
 src/radeon_chipset_gen.h     |    6 ++++++
 src/radeon_pci_chipset_gen.h |    6 ++++++
 6 files changed, 31 insertions(+)

New commits:
commit 7f4db96123fdcba9874226352802d702c2a498bd
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Feb 8 10:47:10 2008 +1000

    add rv670 pciids

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 26d2f09..330d1a9 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -338,6 +338,12 @@
 #define PCI_CHIP_RV610_94C9 0x94C9
 #define PCI_CHIP_RV610_94CB 0x94CB
 #define PCI_CHIP_RV610_94CC 0x94CC
+#define PCI_CHIP_RV670_9500 0x9500
+#define PCI_CHIP_RV670_9501 0x9501
+#define PCI_CHIP_RV670_9505 0x9505
+#define PCI_CHIP_RV670_9507 0x9507
+#define PCI_CHIP_RV670_950F 0x950F
+#define PCI_CHIP_RV670_9511 0x9511
 #define PCI_CHIP_RV630_9580 0x9580
 #define PCI_CHIP_RV630_9581 0x9581
 #define PCI_CHIP_RV630_9583 0x9583
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index f235a5c..5a2191a 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -339,6 +339,12 @@
 "0x94C9","RV610_94C9","RV610",1,,,,,"ATI Mobility Radeon HD 2400"
 "0x94CB","RV610_94CB","RV610",1,,,,,"ATI ATI RADEON E2400"
 "0x94CC","RV610_94CC","RV610",,,,,,"ATI RV610"
+"0x9500","RV670_9500","RV670",,,,,,"ATI RV670"
+"0x9501","RV670_9501","RV670",,,,,,"ATI Radeon HD3870"
+"0x9505","RV670_9505","RV670",,,,,,"ATI Radeon HD3850"
+"0x9507","RV670_9507","RV670",,,,,,"ATI RV670"
+"0x950F","RV670_950F","RV670",,,,,,"ATI Radeon HD3870 X2"
+"0x9511","RV670_9511","RV670",,,,,,"ATI FireGL V7700"
 "0x9580","RV630_9580","RV630",,,,,,"ATI RV630"
 "0x9581","RV630_9581","RV630",1,,,,,"ATI Mobility Radeon HD 2600"
 "0x9583","RV630_9583","RV630",1,,,,,"ATI Mobility Radeon HD 2600 XT"
diff --git a/src/radeon.h b/src/radeon.h
index ac536b9..7950ac8 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -270,6 +270,7 @@ typedef enum {
     CHIP_FAMILY_R630,
     CHIP_FAMILY_RV610,
     CHIP_FAMILY_RV630,
+    CHIP_FAMILY_RV670,
     CHIP_FAMILY_RS740,
     CHIP_FAMILY_LAST
 } RADEONChipFamily;
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 775df06..420f5d8 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -258,6 +258,12 @@ RADEONCardInfo RADEONCards[] = {
  { 0x94C9, CHIP_FAMILY_RV610, 1, 0, 0, 0, 0 },
  { 0x94CB, CHIP_FAMILY_RV610, 1, 0, 0, 0, 0 },
  { 0x94CC, CHIP_FAMILY_RV610, 0, 0, 0, 0, 0 },
+ { 0x9500, CHIP_FAMILY_RV670, 0, 0, 0, 0, 0 },
+ { 0x9501, CHIP_FAMILY_RV670, 0, 0, 0, 0, 0 },
+ { 0x9505, CHIP_FAMILY_RV670, 0, 0, 0, 0, 0 },
+ { 0x9507, CHIP_FAMILY_RV670, 0, 0, 0, 0, 0 },
+ { 0x950F, CHIP_FAMILY_RV670, 0, 0, 0, 0, 0 },
+ { 0x9511, CHIP_FAMILY_RV670, 0, 0, 0, 0, 0 },
  { 0x9580, CHIP_FAMILY_RV630, 0, 0, 0, 0, 0 },
  { 0x9581, CHIP_FAMILY_RV630, 1, 0, 0, 0, 0 },
  { 0x9583, CHIP_FAMILY_RV630, 1, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 0c3fc96..e6890be 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -258,6 +258,12 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_RV610_94C9, "ATI Mobility Radeon HD 2400" },
   { PCI_CHIP_RV610_94CB, "ATI ATI RADEON E2400" },
   { PCI_CHIP_RV610_94CC, "ATI RV610" },
+  { PCI_CHIP_RV670_9500, "ATI RV670" },
+  { PCI_CHIP_RV670_9501, "ATI Radeon HD3870" },
+  { PCI_CHIP_RV670_9505, "ATI Radeon HD3850" },
+  { PCI_CHIP_RV670_9507, "ATI RV670" },
+  { PCI_CHIP_RV670_950F, "ATI Radeon HD3870 X2" },
+  { PCI_CHIP_RV670_9511, "ATI FireGL V7700" },
   { PCI_CHIP_RV630_9580, "ATI RV630" },
   { PCI_CHIP_RV630_9581, "ATI Mobility Radeon HD 2600" },
   { PCI_CHIP_RV630_9583, "ATI Mobility Radeon HD 2600 XT" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 9d73b96..ab6b62a 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -258,6 +258,12 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_RV610_94C9, PCI_CHIP_RV610_94C9, RES_SHARED_VGA },
  { PCI_CHIP_RV610_94CB, PCI_CHIP_RV610_94CB, RES_SHARED_VGA },
  { PCI_CHIP_RV610_94CC, PCI_CHIP_RV610_94CC, RES_SHARED_VGA },
+ { PCI_CHIP_RV670_9500, PCI_CHIP_RV670_9500, RES_SHARED_VGA },
+ { PCI_CHIP_RV670_9501, PCI_CHIP_RV670_9501, RES_SHARED_VGA },
+ { PCI_CHIP_RV670_9505, PCI_CHIP_RV670_9505, RES_SHARED_VGA },
+ { PCI_CHIP_RV670_9507, PCI_CHIP_RV670_9507, RES_SHARED_VGA },
+ { PCI_CHIP_RV670_950F, PCI_CHIP_RV670_950F, RES_SHARED_VGA },
+ { PCI_CHIP_RV670_9511, PCI_CHIP_RV670_9511, RES_SHARED_VGA },
  { PCI_CHIP_RV630_9580, PCI_CHIP_RV630_9580, RES_SHARED_VGA },
  { PCI_CHIP_RV630_9581, PCI_CHIP_RV630_9581, RES_SHARED_VGA },
  { PCI_CHIP_RV630_9583, PCI_CHIP_RV630_9583, RES_SHARED_VGA },