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 7c4b78ab10b82c6dba9f72034ff7583859cca63d
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Tue May 12 13:21:24 2015 -0400

    add new bonaire pci id
    
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    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 d867fa7..1055dce 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -712,6 +712,7 @@
 #define PCI_CHIP_BONAIRE_6658 0x6658
 #define PCI_CHIP_BONAIRE_665C 0x665C
 #define PCI_CHIP_BONAIRE_665D 0x665D
+#define PCI_CHIP_BONAIRE_665F 0x665F
 #define PCI_CHIP_KABINI_9830 0x9830
 #define PCI_CHIP_KABINI_9831 0x9831
 #define PCI_CHIP_KABINI_9832 0x9832
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 1c92f5b..c2a52fc 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -713,6 +713,7 @@
 "0x6658","BONAIRE_6658","BONAIRE",,,,,,"BONAIRE"
 "0x665C","BONAIRE_665C","BONAIRE",,,,,,"BONAIRE"
 "0x665D","BONAIRE_665D","BONAIRE",,,,,,"BONAIRE"
+"0x665F","BONAIRE_665F","BONAIRE",,,,,,"BONAIRE"
 "0x9830","KABINI_9830","KABINI",1,1,,,1,"KABINI"
 "0x9831","KABINI_9831","KABINI",,1,,,1,"KABINI"
 "0x9832","KABINI_9832","KABINI",1,1,,,1,"KABINI"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 40577c9..0673f9a 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -632,6 +632,7 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6658, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
  { 0x665C, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
  { 0x665D, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
+ { 0x665F, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
  { 0x9830, CHIP_FAMILY_KABINI, 1, 1, 0, 0, 1 },
  { 0x9831, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 },
  { 0x9832, CHIP_FAMILY_KABINI, 1, 1, 0, 0, 1 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index e3f23b6..6b56eb6 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -632,6 +632,7 @@ SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_BONAIRE_6658, "BONAIRE" },
   { PCI_CHIP_BONAIRE_665C, "BONAIRE" },
   { PCI_CHIP_BONAIRE_665D, "BONAIRE" },
+  { PCI_CHIP_BONAIRE_665F, "BONAIRE" },
   { PCI_CHIP_KABINI_9830, "KABINI" },
   { PCI_CHIP_KABINI_9831, "KABINI" },
   { PCI_CHIP_KABINI_9832, "KABINI" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index bd68920..61cc50c 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -632,6 +632,7 @@ static PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_BONAIRE_6658, PCI_CHIP_BONAIRE_6658, RES_SHARED_VGA },
  { PCI_CHIP_BONAIRE_665C, PCI_CHIP_BONAIRE_665C, RES_SHARED_VGA },
  { PCI_CHIP_BONAIRE_665D, PCI_CHIP_BONAIRE_665D, RES_SHARED_VGA },
+ { PCI_CHIP_BONAIRE_665F, PCI_CHIP_BONAIRE_665F, RES_SHARED_VGA },
  { PCI_CHIP_KABINI_9830, PCI_CHIP_KABINI_9830, RES_SHARED_VGA },
  { PCI_CHIP_KABINI_9831, PCI_CHIP_KABINI_9831, RES_SHARED_VGA },
  { PCI_CHIP_KABINI_9832, PCI_CHIP_KABINI_9832, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index eaf280a..0b821b2 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -632,6 +632,7 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6658, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_665C, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_665D, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_665F, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_KABINI_9830, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_KABINI_9831, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_KABINI_9832, 0 ),