radeon/kms: add Hawaii pci ids

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

6 files changed, 72 insertions, 0 deletions

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 17222c1f..b34dfe68 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -743,3 +743,15 @@
 #define PCI_CHIP_KAVERI_131B 0x131B
 #define PCI_CHIP_KAVERI_131C 0x131C
 #define PCI_CHIP_KAVERI_131D 0x131D
+#define PCI_CHIP_HAWAII_67A0 0x67A0
+#define PCI_CHIP_HAWAII_67A1 0x67A1
+#define PCI_CHIP_HAWAII_67A2 0x67A2
+#define PCI_CHIP_HAWAII_67A8 0x67A8
+#define PCI_CHIP_HAWAII_67A9 0x67A9
+#define PCI_CHIP_HAWAII_67AA 0x67AA
+#define PCI_CHIP_HAWAII_67B0 0x67B0
+#define PCI_CHIP_HAWAII_67B1 0x67B1
+#define PCI_CHIP_HAWAII_67B8 0x67B8
+#define PCI_CHIP_HAWAII_67B9 0x67B9
+#define PCI_CHIP_HAWAII_67BA 0x67BA
+#define PCI_CHIP_HAWAII_67BE 0x67BE
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index abde9d45..7f52d676 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -744,3 +744,15 @@
 "0x131B","KAVERI_131B","KAVERI",,1,,,1,"KAVERI"
 "0x131C","KAVERI_131C","KAVERI",,1,,,1,"KAVERI"
 "0x131D","KAVERI_131D","KAVERI",,1,,,1,"KAVERI"
+"0x67A0","HAWAII_67A0","HAWAII",,,,,,"HAWAII"
+"0x67A1","HAWAII_67A1","HAWAII",,,,,,"HAWAII"
+"0x67A2","HAWAII_67A2","HAWAII",,,,,,"HAWAII"
+"0x67A8","HAWAII_67A8","HAWAII",,,,,,"HAWAII"
+"0x67A9","HAWAII_67A9","HAWAII",,,,,,"HAWAII"
+"0x67AA","HAWAII_67AA","HAWAII",,,,,,"HAWAII"
+"0x67B0","HAWAII_67B0","HAWAII",,,,,,"HAWAII"
+"0x67B1","HAWAII_67B1","HAWAII",,,,,,"HAWAII"
+"0x67B8","HAWAII_67B8","HAWAII",,,,,,"HAWAII"
+"0x67B9","HAWAII_67B9","HAWAII",,,,,,"HAWAII"
+"0x67BA","HAWAII_67BA","HAWAII",,,,,,"HAWAII"
+"0x67BE","HAWAII_67BE","HAWAII",,,,,,"HAWAII"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index bd4d85f4..be038b62 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -663,4 +663,16 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x131B, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
  { 0x131C, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
  { 0x131D, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x67A0, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67A1, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67A2, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67A8, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67A9, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67AA, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67B0, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67B1, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67B8, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67B9, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67BA, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
+ { 0x67BE, CHIP_FAMILY_HAWAII, 0, 0, 0, 0, 0 },
 };
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 40f2d9c7..0cd484e3 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -663,5 +663,17 @@ SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_KAVERI_131B, "KAVERI" },
   { PCI_CHIP_KAVERI_131C, "KAVERI" },
   { PCI_CHIP_KAVERI_131D, "KAVERI" },
+  { PCI_CHIP_HAWAII_67A0, "HAWAII" },
+  { PCI_CHIP_HAWAII_67A1, "HAWAII" },
+  { PCI_CHIP_HAWAII_67A2, "HAWAII" },
+  { PCI_CHIP_HAWAII_67A8, "HAWAII" },
+  { PCI_CHIP_HAWAII_67A9, "HAWAII" },
+  { PCI_CHIP_HAWAII_67AA, "HAWAII" },
+  { PCI_CHIP_HAWAII_67B0, "HAWAII" },
+  { PCI_CHIP_HAWAII_67B1, "HAWAII" },
+  { PCI_CHIP_HAWAII_67B8, "HAWAII" },
+  { PCI_CHIP_HAWAII_67B9, "HAWAII" },
+  { PCI_CHIP_HAWAII_67BA, "HAWAII" },
+  { PCI_CHIP_HAWAII_67BE, "HAWAII" },
   { -1,                 NULL }
 };
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index e8b5f133..23dcca67 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -663,5 +663,17 @@ static PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_KAVERI_131B, PCI_CHIP_KAVERI_131B, RES_SHARED_VGA },
  { PCI_CHIP_KAVERI_131C, PCI_CHIP_KAVERI_131C, RES_SHARED_VGA },
  { PCI_CHIP_KAVERI_131D, PCI_CHIP_KAVERI_131D, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67A0, PCI_CHIP_HAWAII_67A0, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67A1, PCI_CHIP_HAWAII_67A1, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67A2, PCI_CHIP_HAWAII_67A2, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67A8, PCI_CHIP_HAWAII_67A8, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67A9, PCI_CHIP_HAWAII_67A9, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67AA, PCI_CHIP_HAWAII_67AA, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67B0, PCI_CHIP_HAWAII_67B0, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67B1, PCI_CHIP_HAWAII_67B1, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67B8, PCI_CHIP_HAWAII_67B8, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67B9, PCI_CHIP_HAWAII_67B9, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67BA, PCI_CHIP_HAWAII_67BA, RES_SHARED_VGA },
+ { PCI_CHIP_HAWAII_67BE, PCI_CHIP_HAWAII_67BE, 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 4b0de84a..b3e58a95 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -663,5 +663,17 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_131B, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_131C, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_131D, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67A0, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67A1, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67A2, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67A8, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67A9, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67AA, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67B0, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67B1, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67B8, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67B9, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67BA, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAWAII_67BE, 0 ),
  { 0, 0, 0 }
 };