xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit aef90993621331f01d17b95a751d4924d77eed0c
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Aug 6 11:00:45 2012 -0400

    radeon: add some new SI pci ids
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 5509120..bf9dbfd 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -630,9 +630,12 @@
 #define PCI_CHIP_PITCAIRN_6800 0x6800
 #define PCI_CHIP_PITCAIRN_6801 0x6801
 #define PCI_CHIP_PITCAIRN_6802 0x6802
+#define PCI_CHIP_PITCAIRN_6806 0x6806
 #define PCI_CHIP_PITCAIRN_6808 0x6808
 #define PCI_CHIP_PITCAIRN_6809 0x6809
 #define PCI_CHIP_PITCAIRN_6810 0x6810
+#define PCI_CHIP_PITCAIRN_6816 0x6816
+#define PCI_CHIP_PITCAIRN_6817 0x6817
 #define PCI_CHIP_PITCAIRN_6818 0x6818
 #define PCI_CHIP_PITCAIRN_6819 0x6819
 #define PCI_CHIP_PITCAIRN_684C 0x684C
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 29ff26b..c7df747 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -631,9 +631,12 @@
 "0x6800","PITCAIRN_6800","PITCAIRN",1,,,,,"PITCAIRN"
 "0x6801","PITCAIRN_6801","PITCAIRN",1,,,,,"PITCAIRN"
 "0x6802","PITCAIRN_6802","PITCAIRN",1,,,,,"PITCAIRN"
+"0x6806","PITCAIRN_6806","PITCAIRN",,,,,,"PITCAIRN"
 "0x6808","PITCAIRN_6808","PITCAIRN",,,,,,"PITCAIRN"
 "0x6809","PITCAIRN_6809","PITCAIRN",,,,,,"PITCAIRN"
 "0x6810","PITCAIRN_6810","PITCAIRN",,,,,,"PITCAIRN"
+"0x6816","PITCAIRN_6816","PITCAIRN",,,,,,"PITCAIRN"
+"0x6817","PITCAIRN_6817","PITCAIRN",,,,,,"PITCAIRN"
 "0x6818","PITCAIRN_6818","PITCAIRN",,,,,,"PITCAIRN"
 "0x6819","PITCAIRN_6819","PITCAIRN",,,,,,"PITCAIRN"
 "0x684C","PITCAIRN_684C","PITCAIRN",,,,,,"PITCAIRN"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 295a824..e4f5d2d 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -550,9 +550,12 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6800, CHIP_FAMILY_PITCAIRN, 1, 0, 0, 0, 0 },
  { 0x6801, CHIP_FAMILY_PITCAIRN, 1, 0, 0, 0, 0 },
  { 0x6802, CHIP_FAMILY_PITCAIRN, 1, 0, 0, 0, 0 },
+ { 0x6806, CHIP_FAMILY_PITCAIRN, 0, 0, 0, 0, 0 },
  { 0x6808, CHIP_FAMILY_PITCAIRN, 0, 0, 0, 0, 0 },
  { 0x6809, CHIP_FAMILY_PITCAIRN, 0, 0, 0, 0, 0 },
  { 0x6810, CHIP_FAMILY_PITCAIRN, 0, 0, 0, 0, 0 },
+ { 0x6816, CHIP_FAMILY_PITCAIRN, 0, 0, 0, 0, 0 },
+ { 0x6817, CHIP_FAMILY_PITCAIRN, 0, 0, 0, 0, 0 },
  { 0x6818, CHIP_FAMILY_PITCAIRN, 0, 0, 0, 0, 0 },
  { 0x6819, CHIP_FAMILY_PITCAIRN, 0, 0, 0, 0, 0 },
  { 0x684C, CHIP_FAMILY_PITCAIRN, 0, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 8e887ac..4808eaa 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -550,9 +550,12 @@ SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_PITCAIRN_6800, "PITCAIRN" },
   { PCI_CHIP_PITCAIRN_6801, "PITCAIRN" },
   { PCI_CHIP_PITCAIRN_6802, "PITCAIRN" },
+  { PCI_CHIP_PITCAIRN_6806, "PITCAIRN" },
   { PCI_CHIP_PITCAIRN_6808, "PITCAIRN" },
   { PCI_CHIP_PITCAIRN_6809, "PITCAIRN" },
   { PCI_CHIP_PITCAIRN_6810, "PITCAIRN" },
+  { PCI_CHIP_PITCAIRN_6816, "PITCAIRN" },
+  { PCI_CHIP_PITCAIRN_6817, "PITCAIRN" },
   { PCI_CHIP_PITCAIRN_6818, "PITCAIRN" },
   { PCI_CHIP_PITCAIRN_6819, "PITCAIRN" },
   { PCI_CHIP_PITCAIRN_684C, "PITCAIRN" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 02c0a7e..ca31812 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -550,9 +550,12 @@ static PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_PITCAIRN_6800, PCI_CHIP_PITCAIRN_6800, RES_SHARED_VGA },
  { PCI_CHIP_PITCAIRN_6801, PCI_CHIP_PITCAIRN_6801, RES_SHARED_VGA },
  { PCI_CHIP_PITCAIRN_6802, PCI_CHIP_PITCAIRN_6802, RES_SHARED_VGA },
+ { PCI_CHIP_PITCAIRN_6806, PCI_CHIP_PITCAIRN_6806, RES_SHARED_VGA },
  { PCI_CHIP_PITCAIRN_6808, PCI_CHIP_PITCAIRN_6808, RES_SHARED_VGA },
  { PCI_CHIP_PITCAIRN_6809, PCI_CHIP_PITCAIRN_6809, RES_SHARED_VGA },
  { PCI_CHIP_PITCAIRN_6810, PCI_CHIP_PITCAIRN_6810, RES_SHARED_VGA },
+ { PCI_CHIP_PITCAIRN_6816, PCI_CHIP_PITCAIRN_6816, RES_SHARED_VGA },
+ { PCI_CHIP_PITCAIRN_6817, PCI_CHIP_PITCAIRN_6817, RES_SHARED_VGA },
  { PCI_CHIP_PITCAIRN_6818, PCI_CHIP_PITCAIRN_6818, RES_SHARED_VGA },
  { PCI_CHIP_PITCAIRN_6819, PCI_CHIP_PITCAIRN_6819, RES_SHARED_VGA },
  { PCI_CHIP_PITCAIRN_684C, PCI_CHIP_PITCAIRN_684C, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index f729914..5e0865d 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -550,9 +550,12 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6800, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6801, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6802, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6806, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6808, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6809, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6810, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6816, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6817, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6818, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6819, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_684C, 0 ),