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 8c9266ed2da22a510243f9a952c14d4423f48a2b
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Fri Jul 15 10:44:57 2011 -0400

    radeon: add some new NI 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 566e34a..ff7c91b 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -557,6 +557,7 @@
 #define PCI_CHIP_TURKS_6750 0x6750
 #define PCI_CHIP_TURKS_6758 0x6758
 #define PCI_CHIP_TURKS_6759 0x6759
+#define PCI_CHIP_TURKS_675F 0x675F
 #define PCI_CHIP_CAICOS_6760 0x6760
 #define PCI_CHIP_CAICOS_6761 0x6761
 #define PCI_CHIP_CAICOS_6762 0x6762
@@ -567,4 +568,5 @@
 #define PCI_CHIP_CAICOS_6767 0x6767
 #define PCI_CHIP_CAICOS_6768 0x6768
 #define PCI_CHIP_CAICOS_6770 0x6770
+#define PCI_CHIP_CAICOS_6778 0x6778
 #define PCI_CHIP_CAICOS_6779 0x6779
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 2d63029..131e56c 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -558,6 +558,7 @@
 "0x6750","TURKS_6750","TURKS",,,,,,"TURKS"
 "0x6758","TURKS_6758","TURKS",,,,,,"TURKS"
 "0x6759","TURKS_6759","TURKS",,,,,,"TURKS"
+"0x675F","TURKS_675F","TURKS",,,,,,"TURKS"
 "0x6760","CAICOS_6760","CAICOS",1,,,,,"CAICOS"
 "0x6761","CAICOS_6761","CAICOS",1,,,,,"CAICOS"
 "0x6762","CAICOS_6762","CAICOS",,,,,,"CAICOS"
@@ -568,4 +569,5 @@
 "0x6767","CAICOS_6767","CAICOS",,,,,,"CAICOS"
 "0x6768","CAICOS_6768","CAICOS",,,,,,"CAICOS"
 "0x6770","CAICOS_6770","CAICOS",,,,,,"CAICOS"
+"0x6778","CAICOS_6778","CAICOS",,,,,,"CAICOS"
 "0x6779","CAICOS_6779","CAICOS",,,,,,"CAICOS"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 9c9295e..fcf6b33 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -477,6 +477,7 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6750, CHIP_FAMILY_TURKS, 0, 0, 0, 0, 0 },
  { 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 },
  { 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 },
@@ -487,5 +488,6 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6767, CHIP_FAMILY_CAICOS, 0, 0, 0, 0, 0 },
  { 0x6768, CHIP_FAMILY_CAICOS, 0, 0, 0, 0, 0 },
  { 0x6770, CHIP_FAMILY_CAICOS, 0, 0, 0, 0, 0 },
+ { 0x6778, CHIP_FAMILY_CAICOS, 0, 0, 0, 0, 0 },
  { 0x6779, CHIP_FAMILY_CAICOS, 0, 0, 0, 0, 0 },
 };
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 6b5018d..0303a5d 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -477,6 +477,7 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_TURKS_6750, "TURKS" },
   { PCI_CHIP_TURKS_6758, "TURKS" },
   { PCI_CHIP_TURKS_6759, "TURKS" },
+  { PCI_CHIP_TURKS_675F, "TURKS" },
   { PCI_CHIP_CAICOS_6760, "CAICOS" },
   { PCI_CHIP_CAICOS_6761, "CAICOS" },
   { PCI_CHIP_CAICOS_6762, "CAICOS" },
@@ -487,6 +488,7 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_CAICOS_6767, "CAICOS" },
   { PCI_CHIP_CAICOS_6768, "CAICOS" },
   { PCI_CHIP_CAICOS_6770, "CAICOS" },
+  { PCI_CHIP_CAICOS_6778, "CAICOS" },
   { PCI_CHIP_CAICOS_6779, "CAICOS" },
   { -1,                 NULL }
 };
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index dca2c0c..549eaca 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -477,6 +477,7 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_TURKS_6750, PCI_CHIP_TURKS_6750, RES_SHARED_VGA },
  { 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_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 },
@@ -487,6 +488,7 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_CAICOS_6767, PCI_CHIP_CAICOS_6767, RES_SHARED_VGA },
  { PCI_CHIP_CAICOS_6768, PCI_CHIP_CAICOS_6768, RES_SHARED_VGA },
  { PCI_CHIP_CAICOS_6770, PCI_CHIP_CAICOS_6770, RES_SHARED_VGA },
+ { PCI_CHIP_CAICOS_6778, PCI_CHIP_CAICOS_6778, RES_SHARED_VGA },
  { PCI_CHIP_CAICOS_6779, PCI_CHIP_CAICOS_6779, 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 bf192c4..0739f81 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -477,6 +477,7 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6750, 0 ),
  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_CAICOS_6760, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CAICOS_6761, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CAICOS_6762, 0 ),
@@ -487,6 +488,7 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_CAICOS_6767, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CAICOS_6768, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CAICOS_6770, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAICOS_6778, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CAICOS_6779, 0 ),
  { 0, 0, 0 }
 };