xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 60cd6ceaf44b506433aebf6b3a639a17604dfddd
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Nov 21 18:42:56 2012 -0500

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

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 1b9e4c0..eab9772 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -627,6 +627,7 @@
 #define PCI_CHIP_TAHITI_6798 0x6798
 #define PCI_CHIP_TAHITI_6799 0x6799
 #define PCI_CHIP_TAHITI_679A 0x679A
+#define PCI_CHIP_TAHITI_679B 0x679B
 #define PCI_CHIP_TAHITI_679E 0x679E
 #define PCI_CHIP_TAHITI_679F 0x679F
 #define PCI_CHIP_PITCAIRN_6800 0x6800
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 20497b6..c9987fe 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -628,6 +628,7 @@
 "0x6798","TAHITI_6798","TAHITI",,,,,,"TAHITI"
 "0x6799","TAHITI_6799","TAHITI",,,,,,"TAHITI"
 "0x679A","TAHITI_679A","TAHITI",,,,,,"TAHITI"
+"0x679B","TAHITI_679B","TAHITI",,,,,,"TAHITI"
 "0x679E","TAHITI_679E","TAHITI",,,,,,"TAHITI"
 "0x679F","TAHITI_679F","TAHITI",,,,,,"TAHITI"
 "0x6800","PITCAIRN_6800","PITCAIRN",1,,,,,"PITCAIRN"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 85d52f9..665b8d3 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -547,6 +547,7 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6798, CHIP_FAMILY_TAHITI, 0, 0, 0, 0, 0 },
  { 0x6799, CHIP_FAMILY_TAHITI, 0, 0, 0, 0, 0 },
  { 0x679A, CHIP_FAMILY_TAHITI, 0, 0, 0, 0, 0 },
+ { 0x679B, CHIP_FAMILY_TAHITI, 0, 0, 0, 0, 0 },
  { 0x679E, CHIP_FAMILY_TAHITI, 0, 0, 0, 0, 0 },
  { 0x679F, CHIP_FAMILY_TAHITI, 0, 0, 0, 0, 0 },
  { 0x6800, CHIP_FAMILY_PITCAIRN, 1, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 17e8ee0..3a27416 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -547,6 +547,7 @@ SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_TAHITI_6798, "TAHITI" },
   { PCI_CHIP_TAHITI_6799, "TAHITI" },
   { PCI_CHIP_TAHITI_679A, "TAHITI" },
+  { PCI_CHIP_TAHITI_679B, "TAHITI" },
   { PCI_CHIP_TAHITI_679E, "TAHITI" },
   { PCI_CHIP_TAHITI_679F, "TAHITI" },
   { PCI_CHIP_PITCAIRN_6800, "PITCAIRN" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 3f33c71..bb73901 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -547,6 +547,7 @@ static PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_TAHITI_6798, PCI_CHIP_TAHITI_6798, RES_SHARED_VGA },
  { PCI_CHIP_TAHITI_6799, PCI_CHIP_TAHITI_6799, RES_SHARED_VGA },
  { PCI_CHIP_TAHITI_679A, PCI_CHIP_TAHITI_679A, RES_SHARED_VGA },
+ { PCI_CHIP_TAHITI_679B, PCI_CHIP_TAHITI_679B, RES_SHARED_VGA },
  { PCI_CHIP_TAHITI_679E, PCI_CHIP_TAHITI_679E, RES_SHARED_VGA },
  { PCI_CHIP_TAHITI_679F, PCI_CHIP_TAHITI_679F, RES_SHARED_VGA },
  { PCI_CHIP_PITCAIRN_6800, PCI_CHIP_PITCAIRN_6800, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index cd96199..3c415da 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -547,6 +547,7 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_TAHITI_6798, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_TAHITI_6799, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_TAHITI_679A, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TAHITI_679B, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_TAHITI_679E, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_TAHITI_679F, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_6800, 0 ),