Merge remote-tracking branch 'x86/kitkat-x86' into lollipop-x86

2 files changed, 59 insertions, 1 deletions

diff --git a/radeon/radeon.h b/radeon/radeon.h
index a4c818e..4657c42 100644
--- a/radeon/radeon.h
+++ b/radeon/radeon.h
@@ -101,6 +101,8 @@ typedef enum {
     CHIP_FAMILY_BONAIRE,
     CHIP_FAMILY_KAVERI,
     CHIP_FAMILY_KABINI,
+    CHIP_FAMILY_HAWAII,
+    CHIP_FAMILY_MULLINS,
     CHIP_FAMILY_LAST
 } RADEONChipFamily;
 
diff --git a/radeon/radeon_chipinfo_gen.h b/radeon/radeon_chipinfo_gen.h
index 221d93e..40577c9 100644
--- a/radeon/radeon_chipinfo_gen.h
+++ b/radeon/radeon_chipinfo_gen.h
@@ -380,7 +380,7 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x9645, CHIP_FAMILY_SUMO2, 1, 1, 0, 0, 1 },
  { 0x9647, CHIP_FAMILY_SUMO, 1, 1, 0, 0, 1 },
  { 0x9648, CHIP_FAMILY_SUMO, 1, 1, 0, 0, 1 },
- { 0x9649, CHIP_FAMILY_SUMO, 1, 1, 0, 0, 1 },
+ { 0x9649, CHIP_FAMILY_SUMO2, 1, 1, 0, 0, 1 },
  { 0x964A, CHIP_FAMILY_SUMO, 0, 1, 0, 0, 1 },
  { 0x964B, CHIP_FAMILY_SUMO, 0, 1, 0, 0, 1 },
  { 0x964C, CHIP_FAMILY_SUMO, 0, 1, 0, 0, 1 },
@@ -588,6 +588,7 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6829, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
  { 0x682A, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
  { 0x682B, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
+ { 0x682C, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
  { 0x682D, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
  { 0x682F, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
  { 0x6830, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
@@ -603,8 +604,11 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6601, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
  { 0x6602, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
  { 0x6603, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6604, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6605, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
  { 0x6606, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
  { 0x6607, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6608, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
  { 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 },
@@ -620,6 +624,8 @@ static RADEONCardInfo RADEONCards[] = {
  { 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 },
+ { 0x6646, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
+ { 0x6647, 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 },
@@ -642,4 +648,54 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x983D, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 },
  { 0x983E, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 },
  { 0x983F, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 },
+ { 0x9850, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9851, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9852, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9853, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9854, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9855, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9856, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9857, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9858, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9859, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985A, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985B, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985C, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985D, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985E, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x985F, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x1304, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x1305, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1306, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x1307, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1309, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130A, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130B, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130C, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130D, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130E, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130F, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1310, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1311, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1312, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1313, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1315, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1316, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1317, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x1318, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 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 },
 };