xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 72e386d42516e7cd3c2cbf2fffc9174cd3ec8451
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Wed Nov 30 19:38:35 2011 -0500

    radeon: add some new pci ids
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 1548569..88f0c22 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -559,6 +559,14 @@
 #define PCI_CHIP_TURKS_6758 0x6758
 #define PCI_CHIP_TURKS_6759 0x6759
 #define PCI_CHIP_TURKS_675F 0x675F
+#define PCI_CHIP_TURKS_6840 0x6840
+#define PCI_CHIP_TURKS_6841 0x6841
+#define PCI_CHIP_TURKS_6842 0x6842
+#define PCI_CHIP_TURKS_6843 0x6843
+#define PCI_CHIP_TURKS_6849 0x6849
+#define PCI_CHIP_TURKS_6850 0x6850
+#define PCI_CHIP_TURKS_6858 0x6858
+#define PCI_CHIP_TURKS_6859 0x6859
 #define PCI_CHIP_CAICOS_6760 0x6760
 #define PCI_CHIP_CAICOS_6761 0x6761
 #define PCI_CHIP_CAICOS_6762 0x6762
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index e8a3578..44c3ecb 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -560,6 +560,14 @@
 "0x6758","TURKS_6758","TURKS",,,,,,"TURKS"
 "0x6759","TURKS_6759","TURKS",,,,,,"TURKS"
 "0x675F","TURKS_675F","TURKS",,,,,,"TURKS"
+"0x6840","TURKS_6840","TURKS",1,,,,,"TURKS"
+"0x6841","TURKS_6841","TURKS",1,,,,,"TURKS"
+"0x6842","TURKS_6842","TURKS",1,,,,,"TURKS"
+"0x6843","TURKS_6843","TURKS",1,,,,,"TURKS"
+"0x6849","TURKS_6849","TURKS",,,,,,"TURKS"
+"0x6850","TURKS_6850","TURKS",,,,,,"TURKS"
+"0x6858","TURKS_6858","TURKS",,,,,,"TURKS"
+"0x6859","TURKS_6859","TURKS",,,,,,"TURKS"
 "0x6760","CAICOS_6760","CAICOS",1,,,,,"CAICOS"
 "0x6761","CAICOS_6761","CAICOS",1,,,,,"CAICOS"
 "0x6762","CAICOS_6762","CAICOS",,,,,,"CAICOS"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 51a106b..5511d7e 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -479,6 +479,14 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6758, CHIP_FAMILY_TURKS, 0, 0, 0, 0, 0 },
  { 0x6759, CHIP_FAMILY_TURKS, 0, 0, 0, 0, 0 },
  { 0x675F, CHIP_FAMILY_TURKS, 0, 0, 0, 0, 0 },
+ { 0x6840, CHIP_FAMILY_TURKS, 1, 0, 0, 0, 0 },
+ { 0x6841, CHIP_FAMILY_TURKS, 1, 0, 0, 0, 0 },
+ { 0x6842, CHIP_FAMILY_TURKS, 1, 0, 0, 0, 0 },
+ { 0x6843, CHIP_FAMILY_TURKS, 1, 0, 0, 0, 0 },
+ { 0x6849, CHIP_FAMILY_TURKS, 0, 0, 0, 0, 0 },
+ { 0x6850, CHIP_FAMILY_TURKS, 0, 0, 0, 0, 0 },
+ { 0x6858, CHIP_FAMILY_TURKS, 0, 0, 0, 0, 0 },
+ { 0x6859, CHIP_FAMILY_TURKS, 0, 0, 0, 0, 0 },
  { 0x6760, CHIP_FAMILY_CAICOS, 1, 0, 0, 0, 0 },
  { 0x6761, CHIP_FAMILY_CAICOS, 1, 0, 0, 0, 0 },
  { 0x6762, CHIP_FAMILY_CAICOS, 0, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 5228f06..ac2c0a8 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -479,6 +479,14 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_TURKS_6758, "TURKS" },
   { PCI_CHIP_TURKS_6759, "TURKS" },
   { PCI_CHIP_TURKS_675F, "TURKS" },
+  { PCI_CHIP_TURKS_6840, "TURKS" },
+  { PCI_CHIP_TURKS_6841, "TURKS" },
+  { PCI_CHIP_TURKS_6842, "TURKS" },
+  { PCI_CHIP_TURKS_6843, "TURKS" },
+  { PCI_CHIP_TURKS_6849, "TURKS" },
+  { PCI_CHIP_TURKS_6850, "TURKS" },
+  { PCI_CHIP_TURKS_6858, "TURKS" },
+  { PCI_CHIP_TURKS_6859, "TURKS" },
   { PCI_CHIP_CAICOS_6760, "CAICOS" },
   { PCI_CHIP_CAICOS_6761, "CAICOS" },
   { PCI_CHIP_CAICOS_6762, "CAICOS" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 9af0c9c..73e2dce 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -479,6 +479,14 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_TURKS_6758, PCI_CHIP_TURKS_6758, RES_SHARED_VGA },
  { PCI_CHIP_TURKS_6759, PCI_CHIP_TURKS_6759, RES_SHARED_VGA },
  { PCI_CHIP_TURKS_675F, PCI_CHIP_TURKS_675F, RES_SHARED_VGA },
+ { PCI_CHIP_TURKS_6840, PCI_CHIP_TURKS_6840, RES_SHARED_VGA },
+ { PCI_CHIP_TURKS_6841, PCI_CHIP_TURKS_6841, RES_SHARED_VGA },
+ { PCI_CHIP_TURKS_6842, PCI_CHIP_TURKS_6842, RES_SHARED_VGA },
+ { PCI_CHIP_TURKS_6843, PCI_CHIP_TURKS_6843, RES_SHARED_VGA },
+ { PCI_CHIP_TURKS_6849, PCI_CHIP_TURKS_6849, RES_SHARED_VGA },
+ { PCI_CHIP_TURKS_6850, PCI_CHIP_TURKS_6850, RES_SHARED_VGA },
+ { PCI_CHIP_TURKS_6858, PCI_CHIP_TURKS_6858, RES_SHARED_VGA },
+ { PCI_CHIP_TURKS_6859, PCI_CHIP_TURKS_6859, RES_SHARED_VGA },
  { PCI_CHIP_CAICOS_6760, PCI_CHIP_CAICOS_6760, RES_SHARED_VGA },
  { PCI_CHIP_CAICOS_6761, PCI_CHIP_CAICOS_6761, RES_SHARED_VGA },
  { PCI_CHIP_CAICOS_6762, PCI_CHIP_CAICOS_6762, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index 0e018fa..121b331 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -479,6 +479,14 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6758, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6759, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_TURKS_675F, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6840, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6841, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6842, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6843, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6849, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6850, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6858, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6859, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CAICOS_6760, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CAICOS_6761, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CAICOS_6762, 0 ),