From 0edcefc4c97e4572431c38fe170032470e22e0b7 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 7 Jun 2013 14:56:26 -0400
Subject: radeon/kms: add bonaire pci ids

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 src/ati_pciids_gen.h              | 8 ++++++++
 src/pcidb/ati_pciids.csv          | 8 ++++++++
 src/radeon_chipinfo_gen.h         | 8 ++++++++
 src/radeon_chipset_gen.h          | 8 ++++++++
 src/radeon_pci_chipset_gen.h      | 8 ++++++++
 src/radeon_pci_device_match_gen.h | 8 ++++++++
 6 files changed, 48 insertions(+)

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 78523c58..7a94c273 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -698,3 +698,11 @@
 #define PCI_CHIP_HAINAN_6665 0x6665
 #define PCI_CHIP_HAINAN_6667 0x6667
 #define PCI_CHIP_HAINAN_666F 0x666F
+#define PCI_CHIP_BONAIRE_6640 0x6640
+#define PCI_CHIP_BONAIRE_6641 0x6641
+#define PCI_CHIP_BONAIRE_6649 0x6649
+#define PCI_CHIP_BONAIRE_6650 0x6650
+#define PCI_CHIP_BONAIRE_6651 0x6651
+#define PCI_CHIP_BONAIRE_6658 0x6658
+#define PCI_CHIP_BONAIRE_665C 0x665C
+#define PCI_CHIP_BONAIRE_665D 0x665D
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 4de5d28e..338f150f 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -699,3 +699,11 @@
 "0x6665","HAINAN_6665","HAINAN",1,,,,,"HAINAN"
 "0x6667","HAINAN_6667","HAINAN",1,,,,,"HAINAN"
 "0x666F","HAINAN_666F","HAINAN",1,,,,,"HAINAN"
+"0x6640","BONAIRE_6640","BONAIRE",1,,,,,"BONAIRE"
+"0x6641","BONAIRE_6641","BONAIRE",1,,,,,"BONAIRE"
+"0x6649","BONAIRE_6649","BONAIRE",,,,,,"BONAIRE"
+"0x6650","BONAIRE_6650","BONAIRE",,,,,,"BONAIRE"
+"0x6651","BONAIRE_6651","BONAIRE",,,,,,"BONAIRE"
+"0x6658","BONAIRE_6658","BONAIRE",,,,,,"BONAIRE"
+"0x665C","BONAIRE_665C","BONAIRE",,,,,,"BONAIRE"
+"0x665D","BONAIRE_665D","BONAIRE",,,,,,"BONAIRE"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 687f2568..7dba1a05 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -618,4 +618,12 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6665, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
  { 0x6667, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
  { 0x666F, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
+ { 0x6640, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
+ { 0x6641, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
+ { 0x6649, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
+ { 0x6650, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
+ { 0x6651, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
+ { 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 },
 };
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 2ae7cc93..a7fe62f7 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -618,5 +618,13 @@ SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_HAINAN_6665, "HAINAN" },
   { PCI_CHIP_HAINAN_6667, "HAINAN" },
   { PCI_CHIP_HAINAN_666F, "HAINAN" },
+  { PCI_CHIP_BONAIRE_6640, "BONAIRE" },
+  { PCI_CHIP_BONAIRE_6641, "BONAIRE" },
+  { PCI_CHIP_BONAIRE_6649, "BONAIRE" },
+  { PCI_CHIP_BONAIRE_6650, "BONAIRE" },
+  { PCI_CHIP_BONAIRE_6651, "BONAIRE" },
+  { PCI_CHIP_BONAIRE_6658, "BONAIRE" },
+  { PCI_CHIP_BONAIRE_665C, "BONAIRE" },
+  { PCI_CHIP_BONAIRE_665D, "BONAIRE" },
   { -1,                 NULL }
 };
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 29c23b2c..f537fb21 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -618,5 +618,13 @@ static PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_HAINAN_6665, PCI_CHIP_HAINAN_6665, RES_SHARED_VGA },
  { PCI_CHIP_HAINAN_6667, PCI_CHIP_HAINAN_6667, RES_SHARED_VGA },
  { PCI_CHIP_HAINAN_666F, PCI_CHIP_HAINAN_666F, RES_SHARED_VGA },
+ { 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_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 },
+ { 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 },
  { -1,                 -1,                 RES_UNDEFINED }
 };
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index 9b669fd0..1a5423ef 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -618,5 +618,13 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_6665, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_6667, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_666F, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6640, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6641, 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 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6658, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_665C, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_665D, 0 ),
  { 0, 0, 0 }
 };
-- 
cgit v1.2.3