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 270da55340766074cabff8af4258e29fe2f0fc81
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Mon Aug 10 15:32:34 2015 -0400

    add new OLAND pci id
    
    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 1055dce..c6216a5 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -692,6 +692,7 @@
 #define PCI_CHIP_OLAND_6610 0x6610
 #define PCI_CHIP_OLAND_6611 0x6611
 #define PCI_CHIP_OLAND_6613 0x6613
+#define PCI_CHIP_OLAND_6617 0x6617
 #define PCI_CHIP_OLAND_6620 0x6620
 #define PCI_CHIP_OLAND_6621 0x6621
 #define PCI_CHIP_OLAND_6623 0x6623
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index c2a52fc..55d7b1d 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -693,6 +693,7 @@
 "0x6610","OLAND_6610","OLAND",,,,,,"OLAND"
 "0x6611","OLAND_6611","OLAND",,,,,,"OLAND"
 "0x6613","OLAND_6613","OLAND",,,,,,"OLAND"
+"0x6617","OLAND_6617","OLAND",1,,,,,"OLAND"
 "0x6620","OLAND_6620","OLAND",1,,,,,"OLAND"
 "0x6621","OLAND_6621","OLAND",1,,,,,"OLAND"
 "0x6623","OLAND_6623","OLAND",1,,,,,"OLAND"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 0673f9a..91ef8df 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -612,6 +612,7 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6610, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
  { 0x6611, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
  { 0x6613, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
+ { 0x6617, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
  { 0x6620, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
  { 0x6621, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
  { 0x6623, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 6b56eb6..5d6d233 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -612,6 +612,7 @@ SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_OLAND_6610, "OLAND" },
   { PCI_CHIP_OLAND_6611, "OLAND" },
   { PCI_CHIP_OLAND_6613, "OLAND" },
+  { PCI_CHIP_OLAND_6617, "OLAND" },
   { PCI_CHIP_OLAND_6620, "OLAND" },
   { PCI_CHIP_OLAND_6621, "OLAND" },
   { PCI_CHIP_OLAND_6623, "OLAND" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 61cc50c..4b4b8e4 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -612,6 +612,7 @@ static PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_OLAND_6610, PCI_CHIP_OLAND_6610, RES_SHARED_VGA },
  { PCI_CHIP_OLAND_6611, PCI_CHIP_OLAND_6611, RES_SHARED_VGA },
  { PCI_CHIP_OLAND_6613, PCI_CHIP_OLAND_6613, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6617, PCI_CHIP_OLAND_6617, RES_SHARED_VGA },
  { PCI_CHIP_OLAND_6620, PCI_CHIP_OLAND_6620, RES_SHARED_VGA },
  { PCI_CHIP_OLAND_6621, PCI_CHIP_OLAND_6621, RES_SHARED_VGA },
  { PCI_CHIP_OLAND_6623, PCI_CHIP_OLAND_6623, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index 0b821b2..6dfe1e4 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -612,6 +612,7 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6610, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6611, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6613, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6617, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6620, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6621, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6623, 0 ),