xf86-video-amdgpu: Branch 'master'

[Michel Dänzer]

 src/amdgpu_chipinfo_gen.h         |    1 +
 src/amdgpu_chipset_gen.h          |    1 +
 src/amdgpu_pci_chipset_gen.h      |    1 +
 src/amdgpu_pci_device_match_gen.h |    1 +
 src/ati_pciids_gen.h              |    1 +
 src/pcidb/ati_pciids.csv          |    1 +
 6 files changed, 6 insertions(+)

New commits:
commit 4822ec7a23d2253c88bc403f17abb6d7a053528c
Author: Flora Cui <flora.cui at amd.com>
Date:   Tue May 10 17:14:00 2016 +0900

    add strato pci id
    
    Signed-off-by: Flora Cui <flora.cui at amd.com>
    Reviewed-by: Jammy Zhou <Jammy.Zhou at amd.com>

diff --git a/src/amdgpu_chipinfo_gen.h b/src/amdgpu_chipinfo_gen.h
index 4a0f6b8..f0e7c3c 100644
--- a/src/amdgpu_chipinfo_gen.h
+++ b/src/amdgpu_chipinfo_gen.h
@@ -2,6 +2,7 @@
 static AMDGPUCardInfo AMDGPUCards[] = {
  { 0x6640, CHIP_FAMILY_BONAIRE },
  { 0x6641, CHIP_FAMILY_BONAIRE },
+ { 0x6646, CHIP_FAMILY_BONAIRE },
  { 0x6649, CHIP_FAMILY_BONAIRE },
  { 0x6650, CHIP_FAMILY_BONAIRE },
  { 0x6651, CHIP_FAMILY_BONAIRE },
diff --git a/src/amdgpu_chipset_gen.h b/src/amdgpu_chipset_gen.h
index 1be967c..6cbffe7 100644
--- a/src/amdgpu_chipset_gen.h
+++ b/src/amdgpu_chipset_gen.h
@@ -2,6 +2,7 @@
 SymTabRec AMDGPUChipsets[] = {
   { PCI_CHIP_BONAIRE_6640, "BONAIRE" },
   { PCI_CHIP_BONAIRE_6641, "BONAIRE" },
+  { PCI_CHIP_BONAIRE_6646, "BONAIRE" },
   { PCI_CHIP_BONAIRE_6649, "BONAIRE" },
   { PCI_CHIP_BONAIRE_6650, "BONAIRE" },
   { PCI_CHIP_BONAIRE_6651, "BONAIRE" },
diff --git a/src/amdgpu_pci_chipset_gen.h b/src/amdgpu_pci_chipset_gen.h
index 9ed8faf..08af565 100644
--- a/src/amdgpu_pci_chipset_gen.h
+++ b/src/amdgpu_pci_chipset_gen.h
@@ -2,6 +2,7 @@
 static PciChipsets AMDGPUPciChipsets[] = {
  { PCI_CHIP_BONAIRE_6640, PCI_CHIP_BONAIRE_6640, RES_SHARED_VGA },
  { PCI_CHIP_BONAIRE_6641, PCI_CHIP_BONAIRE_6641, RES_SHARED_VGA },
+ { PCI_CHIP_BONAIRE_6646, PCI_CHIP_BONAIRE_6646, RES_SHARED_VGA },
  { PCI_CHIP_BONAIRE_6649, PCI_CHIP_BONAIRE_6649, RES_SHARED_VGA },
  { PCI_CHIP_BONAIRE_6650, PCI_CHIP_BONAIRE_6650, RES_SHARED_VGA },
  { PCI_CHIP_BONAIRE_6651, PCI_CHIP_BONAIRE_6651, RES_SHARED_VGA },
diff --git a/src/amdgpu_pci_device_match_gen.h b/src/amdgpu_pci_device_match_gen.h
index dd2c0cd..e093dcd 100644
--- a/src/amdgpu_pci_device_match_gen.h
+++ b/src/amdgpu_pci_device_match_gen.h
@@ -2,6 +2,7 @@
 static const struct pci_id_match amdgpu_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6640, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6641, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6646, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6649, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6650, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6651, 0 ),
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index a949118..40acd6a 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -1,5 +1,6 @@
 #define PCI_CHIP_BONAIRE_6640 0x6640
 #define PCI_CHIP_BONAIRE_6641 0x6641
+#define PCI_CHIP_BONAIRE_6646 0x6646
 #define PCI_CHIP_BONAIRE_6649 0x6649
 #define PCI_CHIP_BONAIRE_6650 0x6650
 #define PCI_CHIP_BONAIRE_6651 0x6651
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 7620aa3..c1d4527 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -1,6 +1,7 @@
 "#pciid","define","family","name"
 "0x6640","BONAIRE_6640","BONAIRE","BONAIRE"
 "0x6641","BONAIRE_6641","BONAIRE","BONAIRE"
+"0x6646","BONAIRE_6646","BONAIRE","BONAIRE"
 "0x6649","BONAIRE_6649","BONAIRE","BONAIRE"
 "0x6650","BONAIRE_6650","BONAIRE","BONAIRE"
 "0x6651","BONAIRE_6651","BONAIRE","BONAIRE"