Index: branches/ErmaC/Trunk/i386/libsaio/gma.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/gma.c (revision 1899) +++ branches/ErmaC/Trunk/i386/libsaio/gma.c (revision 1900) @@ -111,6 +111,8 @@ static struct gma_gpu_t KnownGPUS[] = { { 0x00000000, "Unknown" }, + { 0x80860042, "Desktop GMA HD" }, + { 0x80860046, "Mobile GMA HD" }, { 0x808627A2, "Mobile GMA950" }, { 0x808627AE, "Mobile GMA950" }, { 0x808627A6, "Mobile GMA950" }, @@ -121,6 +123,7 @@ // { 0x8086A001, "Desktop GMA3150" }, { 0x8086A001, "Mobile GMA3150" }, { 0x8086A002, "Desktop GMA3150" }, + { 0x80862A02, "GMAX3100" }, { 0x80862A03, "GMAX3100" }, { 0x80862A12, "GMAX3100" }, Index: branches/ErmaC/Trunk/i386/libsaio/nvidia.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/nvidia.c (revision 1899) +++ branches/ErmaC/Trunk/i386/libsaio/nvidia.c (revision 1900) @@ -457,6 +457,7 @@ { 0x10DE061E, "Quadro FX 3700M" }, { 0x10DE061F, "Quadro FX 3800M" }, // 0620 - 062F +// { 0x10DE0620, "Unknown" }, { 0x10DE0621, "GeForce GT 230" }, { 0x10DE0622, "GeForce 9600 GT" }, { 0x10DE0623, "GeForce 9600 GS" }, @@ -464,18 +465,30 @@ { 0x10DE0626, "GeForce GT 130" }, { 0x10DE0627, "GeForce GT 140" }, { 0x10DE0628, "GeForce 9800M GTS" }, +// { 0x10DE0629, "Unknown" }, { 0x10DE062A, "GeForce 9700M GTS" }, { 0x10DE062B, "GeForce 9800M GS" }, { 0x10DE062C, "GeForce 9800M GTS" }, { 0x10DE062D, "GeForce 9600 GT" }, { 0x10DE062E, "GeForce 9600 GT" }, +// { 0x10DE062F, "Unknown" }, // 0630 - 063F +// { 0x10DE0630, "Unknown" }, { 0x10DE0631, "GeForce GTS 160M" }, { 0x10DE0632, "GeForce GTS 150M" }, +// { 0x10DE0633, "Unknown" }, +// { 0x10DE0634, "Unknown" }, { 0x10DE0635, "GeForce 9600 GSO" }, +// { 0x10DE0636, "Unknown" }, { 0x10DE0637, "GeForce 9600 GT" }, { 0x10DE0638, "Quadro FX 1800" }, +// { 0x10DE0639, "Unknown" }, { 0x10DE063A, "Quadro FX 2700M" }, +// { 0x10DE063B, "Unknown" }, +// { 0x10DE063C, "Unknown" }, +// { 0x10DE063D, "Unknown" }, +// { 0x10DE063E, "Unknown" }, +// { 0x10DE063F, "Unknown" }, // 0640 - 064F { 0x10DE0640, "GeForce 9500 GT" }, { 0x10DE0641, "GeForce 9400 GT" }, @@ -590,6 +603,22 @@ { 0x10DE084D, "nForce 750a SLI" }, { 0x10DE084F, "GeForce 8100 / nForce 720a" }, // 0850 - 085F +// { 0x10DE0850, "Unknown" }, +// { 0x10DE0851, "Unknown" }, +// { 0x10DE0852, "Unknown" }, +// { 0x10DE0853, "Unknown" }, +// { 0x10DE0854, "Unknown" }, +// { 0x10DE0855, "Unknown" }, +// { 0x10DE0856, "Unknown" }, +// { 0x10DE0857, "Unknown" }, +// { 0x10DE0858, "Unknown" }, +// { 0x10DE0859, "Unknown" }, +// { 0x10DE085A, "Unknown" }, +// { 0x10DE085B, "Unknown" }, +// { 0x10DE085C, "Unknown" }, +// { 0x10DE085D, "Unknown" }, +// { 0x10DE085E, "Unknown" }, +// { 0x10DE085F, "Unknown" }, // 0860 - 086F { 0x10DE0860, "GeForce 9300" }, // { 0x10DE0861, "GeForce 9400" }, @@ -621,8 +650,16 @@ // 0890 - 089F // 08A0 - 08AF { 0x10DE08A0, "GeForce 320M" }, +// { 0x10DE08A1, "Unknown" }, +// { 0x10DE08A2, "Unknown" }, + { 0x10DE08A3, "GeForce 320M" }, { 0x10DE08A4, "GeForce 320M" }, +// { 0x10DE08A5, "Unknown" }, // 08B0 - 08BF +// { 0x10DE08B0, "Unknown" }, +// { 0x10DE08B1, "Unknown" }, +// { 0x10DE08B2, "Unknown" }, +// { 0x10DE08B3, "Unknown" }, // 08C0 - 08CF // 08D0 - 08DF // 08E0 - 08EF @@ -662,6 +699,8 @@ { 0x10DE0A35, "GeForce GT 325M" }, { 0x10DE0A38, "Quadro 400" }, { 0x10DE0A3C, "Quadro FX 880M" }, +// { 0x10DE0A3D, "Unknown" }, +// { 0x10DE0A3F, "Unknown" }, // 0A40 - 0A4F // 0A50 - 0A5F // 0A60 - 0A6F @@ -687,8 +726,12 @@ { 0x10DE0A75, "GeForce G310M" }, { 0x10DE0A76, "ION" }, { 0x10DE0A78, "Quadro FX 380 LP" }, +// { 0x10DE0A79, "Unknown" }, { 0x10DE0A7A, "GeForce 315M" }, { 0x10DE0A7C, "Quadro FX 380M" }, +// { 0x10DE0A7D, "Unknown" }, +// { 0x10DE0A7E, "Unknown" }, +// { 0x10DE0A7F, "Unknown" }, // 0A80 - 0A8F // 0A90 - 0A9F // 0AA0 - 0AAF @@ -733,6 +776,8 @@ { 0x10DE0CA8, "GeForce GTS 260M" }, { 0x10DE0CA9, "GeForce GTS 250M" }, { 0x10DE0CAC, "GeForce GT 220" }, +// { 0x10DE0CAD, "Unknown" }, +// { 0x10DE0CAE, "Unknown" }, { 0x10DE0CAF, "GeForce GT 335M" }, // 0CB0 - 0CBF { 0x10DE0CB0, "GeForce GTS 350M" }, @@ -762,9 +807,12 @@ { 0x10DE0DC5, "GeForce GTS 450" }, { 0x10DE0DC6, "GeForce GTS 450" }, { 0x10DE0DCA, "GF10x" }, +// { 0x10DE0DCC, "Unknown" }, { 0x10DE0DCD, "GeForce GT 555M" }, { 0x10DE0DCE, "GeForce GT 555M" }, +// { 0x10DE0DCF, "Unknown" }, // 0DD0 - 0DDF +// { 0x10DE0DD0, "Unknown" }, { 0x10DE0DD1, "GeForce GTX 460M" }, // subsystem 10de:0dd1:1558:8687 { 0x10DE0DD2, "GeForce GT 445M" }, { 0x10DE0DD3, "GeForce GT 435M" }, @@ -778,11 +826,14 @@ { 0x10DE0DE1, "GeForce GT 430" }, // subsystem 10de:0de1:3842:1430 { 0x10DE0DE2, "GeForce GT 420" }, { 0x10DE0DE5, "GeForce GT 530" }, +// { 0x10DE0DE8, "Unknown" }, { 0x10DE0DE9, "GeForce GT 600M" }, // + { 0x10DE0DEA, "GeForce GT 610M" }, { 0x10DE0DEB, "GeForce GT 555M" }, { 0x10DE0DEC, "GeForce GT 525M" }, { 0x10DE0DED, "GeForce GT 520M" }, { 0x10DE0DEE, "GeForce GT 415M" }, +// { 0x10DE0DEF, "Unknown" }, // 0DF0 - 0DFF { 0x10DE0DF0, "GeForce GT 425M" }, { 0x10DE0DF1, "GeForce GT 420M" }, @@ -793,7 +844,9 @@ { 0x10DE0DF6, "GeForce GT 550M" }, { 0x10DE0DF7, "GeForce GT 520M" }, { 0x10DE0DF8, "Quadro 600" }, +// { 0x10DE0DF9, "Unknown" }, { 0x10DE0DFA, "Quadro 1000M" }, +// { 0x10DE0DFC, "Unknown" }, { 0x10DE0DFE, "GF108 ES" }, { 0x10DE0DFF, "GF108 INT" }, // 0E00 - 0E0F @@ -807,6 +860,7 @@ // 0E30 - 0E3F { 0x10DE0E30, "GeForce GTX 470M" }, { 0x10DE0E31, "GeForce GTX 485M" }, +// { 0x10DE0E32, "Unknown" }, { 0x10DE0E38, "GF104GL" }, { 0x10DE0E3A, "Quadro 3000M" }, { 0x10DE0E3B, "Quadro 4000M" }, @@ -850,11 +904,18 @@ // 1050 - 105F { 0x10DE1050, "GeForce GT 520M" }, { 0x10DE1051, "GeForce GT 520MX" }, +// { 0x10DE1052, "Unknown" }, { 0x10DE1054, "GeForce GT 410M" }, - { 0x10DE1056, "NVS 4200M" }, - { 0x10DE1057, "NVS 4200M" }, + { 0x10DE1055, "GeForce 410M" }, + { 0x10DE1056, "Quadro NVS 4200M" }, + { 0x10DE1057, "Quadro NVS 4200M" }, +// { 0x10DE1058, "Unknown" }, +// { 0x10DE1059, "Unknown" }, +// { 0x10DE105A, "Unknown" }, // 1060 - 106F // 1070 - 107F +// { 0x10DE107D, "Unknown" }, +// { 0x10DE107E, "Unknown" }, { 0x10DE107F, "NVIDIA GF119-ES" }, // 1080 - 108F { 0x10DE1080, "GeForce GTX 580" }, @@ -869,8 +930,8 @@ { 0x10DE108B, "GeForce GTX 590" }, // 1090 - 109F { 0x10DE1091, "Tesla M2090" }, - { 0x10DE1094, "Tesla M2075 Dual-Slot Computing Processor Module" }, // - { 0x10DE1096, "Tesla C2075" }, // + { 0x10DE1094, "Tesla M2075 Dual-Slot Computing Processor Module" }, + { 0x10DE1096, "Tesla C2075" }, { 0x10DE1098, "D13U" }, { 0x10DE109A, "Quadro 5010M" }, { 0x10DE109B, "Quadro 7000" }, @@ -879,22 +940,31 @@ // 10C0 - 10CF { 0x10DE10C0, "GeForce 9300 GS" }, { 0x10DE10C3, "GeForce 8400 GS" }, +// { 0x10DE10C4, "Unknown" }, { 0x10DE10C5, "GeForce 405" }, // 10D0 - 10DF { 0x10DE10D8, "NVS 300" }, + // 1100 - + // 1200 - { 0x10DE1200, "GeForce GTX 560 Ti" }, { 0x10DE1201, "GeForce GTX 560" }, - { 0x10DE1205, "GeForce GTX 460 v2" }, // GF114 - { 0x10DE1208, "GeForce GTX 560 SE" }, // - { 0x10DE1210, "GeForce GTX 570M" }, // - { 0x10DE1211, "GeForce GTX 580M" }, // - { 0x10DE1212, "GeForce GTX 675M" }, // - { 0x10DE1213, "GeForce GTX 670M" }, // + { 0x10DE1205, "GeForce GTX 460 v2" }, + { 0x10DE1208, "GeForce GTX 560 SE" }, + { 0x10DE1210, "GeForce GTX 570M" }, + { 0x10DE1211, "GeForce GTX 580M" }, + { 0x10DE1212, "GeForce GTX 675M" }, + { 0x10DE1213, "GeForce GTX 670M" }, +// { 0x10DE1240, "Unknown" }, { 0x10DE1241, "GeForce GT 545" }, { 0x10DE1243, "GeForce GT 545" }, { 0x10DE1244, "GeForce GTX 550 Ti" }, { 0x10DE1245, "GeForce GTS 450" }, + { 0x10DE1246, "GeForce GTX 550M" }, + { 0x10DE1247, "GeForce GTX 555M" }, + { 0x10DE1248, "GeForce GTX 555M" }, + { 0x10DE124D, "GeForce GTX 555M" }, +// { 0x10DE1250, "Unknown" }, { 0x10DE1251, "GeForce GTX 560M" }, }; Index: branches/ErmaC/Trunk/i386/libsaio/ati.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/ati.c (revision 1899) +++ branches/ErmaC/Trunk/i386/libsaio/ati.c (revision 1900) @@ -62,8 +62,8 @@ CHIP_FAMILY_TURKS, /* Southern Islands */ CHIP_FAMILY_TAHITI, - CHIP_FAMILY_PITCAIRN, - CHIP_FAMILY_CAPEVERDE, + CHIP_FAMILY_PITCAIRN, + CHIP_FAMILY_CAPEVERDE, // CHIP_FAMILY_THAMES, // CHIP_FAMILY_LOMBOK, // CHIP_FAMILY_NEWZEALAND, @@ -107,8 +107,8 @@ "Turks", /* Southern Islands */ "Tahiti", - "Pitcairn", - "CapeVerde", + "Pitcairn", + "CapeVerde", // "Thames", // "Lombok", // "NewZealand", @@ -457,15 +457,15 @@ { 0x68B8, 0x200B1787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, { 0x68B8, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet }, - { 0x68BA, 0x03FE1043, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, // - { 0x68BA, 0x1482174B, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, // + { 0x68BA, 0x03FE1043, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, + { 0x68BA, 0x1482174B, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, { 0x68BA, 0x174B1482, CHIP_FAMILY_JUNIPER, "ATI Sapphire Radeon HD 6770", kVervet }, - { 0x68BA, 0x200A1787, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, // - { 0x68BA, 0x21421462, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, // + { 0x68BA, 0x200A1787, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, + { 0x68BA, 0x21421462, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, { 0x68BA, 0x31501682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, - { 0x68BA, 0x31521682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, // - { 0x68BA, 0x31531682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, // - { 0x68BA, 0xE144174B, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, // + { 0x68BA, 0x31521682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, + { 0x68BA, 0x31531682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, + { 0x68BA, 0xE144174B, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet }, { 0x68BE, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5750", kVervet }, @@ -520,7 +520,7 @@ { 0x68F9, 0x010E1002, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, { 0x68F9, 0x03741043, CHIP_FAMILY_CEDAR, "ASUS EAH5450", kEulemur }, - { 0x68F9, 0x03CA1043, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, // + { 0x68F9, 0x03CA1043, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, { 0x68F9, 0x20091787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, { 0x68F9, 0x22911787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, { 0x68F9, 0x23401462, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur }, @@ -538,19 +538,19 @@ /* Northen Islands */ { 0x6718, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, - { 0x6718, 0x20101458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, // - { 0x6718, 0x22001458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, // - { 0x6718, 0x23061787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, // - { 0x6718, 0x23701462, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, // + { 0x6718, 0x20101458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, + { 0x6718, 0x22001458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, + { 0x6718, 0x23061787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, + { 0x6718, 0x23701462, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, { 0x6718, 0x31301682, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, { 0x6718, 0x67181002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba }, - { 0x6719, 0x03D41043, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull }, // + { 0x6719, 0x03D41043, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull }, { 0x6719, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba }, { 0x6719, 0x186B174B, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull }, { 0x6719, 0x20101787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba }, { 0x6719, 0x21FD1458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba }, - { 0x6719, 0x23071787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull }, // + { 0x6719, 0x23071787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull }, { 0x671D, 0x0B2A1002, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull }, { 0x671D, 0x1B2A1002, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull }, @@ -558,17 +558,17 @@ { 0x6720, 0x04901028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kElodea }, { 0x6720, 0x04BA1028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kElodea }, - { 0x6720, 0x51041558, CHIP_FAMILY_BARTS, "AMD Radeon HD 6990M", kElodea }, // ?? + { 0x6720, 0x51041558, CHIP_FAMILY_BARTS, "AMD Radeon HD 6990M", kElodea }, { 0x6738, 0x00D01002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, - { 0x6738, 0x03AE1043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, // - { 0x6738, 0x03C61043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, // + { 0x6738, 0x03AE1043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, + { 0x6738, 0x03C61043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x174B174B, CHIP_FAMILY_BARTS, "Sapphire Radeon HD6870", kBulrushes }, { 0x6738, 0x20101787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x21FA1002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x21FA1458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x23051787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, - { 0x6738, 0x25101462, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, // + { 0x6738, 0x25101462, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x31031682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x31041682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, { 0x6738, 0x31071682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed }, @@ -578,17 +578,17 @@ { 0x6739, 0x03B41043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, { 0x6739, 0x21F81458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kBulrushes }, - { 0x6739, 0x23041787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, // + { 0x6739, 0x23041787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, { 0x6739, 0x24411462, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, { 0x6739, 0x31101682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, { 0x6739, 0x67391002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, { 0x6739, 0xAA881002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, { 0x6739, 0xE177174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed }, - { 0x673E, 0x174B174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull }, // - { 0x673E, 0x23101787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull }, // - { 0x673E, 0x31701682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull }, // - { 0x673E, 0x31721682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull }, // + { 0x673E, 0x174B174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull }, + { 0x673E, 0x23101787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull }, + { 0x673E, 0x31701682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull }, + { 0x673E, 0x31721682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull }, { 0x6740, 0x04A31028, CHIP_FAMILY_TURKS, "Dell HD 6770M", kNull }, // ?? { 0x6740, 0x1D121043, CHIP_FAMILY_TURKS, "AMD Radeon HD 6730M", kNull }, @@ -618,48 +618,49 @@ { 0x6759, 0xE193174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570", kNull }, { 0x6760, 0x00031179, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull }, - - { 0x6760, 0x00031179, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull }, - { 0x6760, 0x04CC1028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6490M", kNull }, + { 0x6760, 0x04C11028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull }, + { 0x6760, 0x04CA1028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull }, + { 0x6760, 0x04CC1028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull }, + { 0x6760, 0x101C1043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull }, { 0x6760, 0x165A103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull }, { 0x6760, 0x167D103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull }, { 0x6760, 0x1CB21043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull }, - { 0x6779, 0x00001002, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // - { 0x6779, 0x03DA1043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // - { 0x6779, 0x03DC1043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // - { 0x6779, 0x20121787, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // - { 0x6779, 0x21201028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // - { 0x6779, 0x21251462, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // - { 0x6779, 0x22031458, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // - { 0x6779, 0x22041458, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // - { 0x6779, 0x23111787, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // - { 0x6779, 0x32001682, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // + { 0x6779, 0x00001002, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0x03DA1043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0x03DC1043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0x20121787, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0x21201028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0x21251462, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0x22031458, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0x22041458, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0x23111787, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0x32001682, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, { 0x6779, 0x64501092, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, - { 0x6779, 0x909D1B0A, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // + { 0x6779, 0x909D1B0A, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, { 0x6779, 0xE164174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, { 0x6779, 0xE180174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kPithecia }, - { 0x6779, 0xE190174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // - { 0x6779, 0xE199174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, // + { 0x6779, 0xE190174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, + { 0x6779, 0xE199174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes }, /* Southen Islands */ - { 0x6798, 0x04181043, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, // - { 0x6798, 0x04201043, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, // - { 0x6798, 0x0B001002, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, // - { 0x6798, 0x201C1787, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, // - { 0x6798, 0x254D1458, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, // - { 0x6798, 0x32101682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, // - { 0x6798, 0x32111682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, // - { 0x6798, 0x32121682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, // - { 0x6798, 0x32131682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, // + { 0x6798, 0x04181043, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, + { 0x6798, 0x04201043, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, + { 0x6798, 0x0B001002, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, + { 0x6798, 0x201C1787, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, + { 0x6798, 0x254D1458, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, + { 0x6798, 0x32101682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, + { 0x6798, 0x32111682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, + { 0x6798, 0x32121682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, + { 0x6798, 0x32131682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull }, - { 0x679A, 0x0B001002, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, // - { 0x679A, 0x23161787, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, // - { 0x679A, 0x254C1458, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, // - { 0x679A, 0x27601462, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, // - { 0x679A, 0x32211682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, // - { 0x679A, 0xE207174B, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, // + { 0x679A, 0x0B001002, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, + { 0x679A, 0x23161787, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, + { 0x679A, 0x254C1458, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, + { 0x679A, 0x27601462, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, + { 0x679A, 0x32211682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, + { 0x679A, 0xE207174B, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull }, /* standard/default models */ { 0x9400, 0x00000000, CHIP_FAMILY_R600, "ATI Radeon HD 2900 XT", kNull }, @@ -735,17 +736,22 @@ { 0x6898, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5800 Series", kUakari }, { 0x6899, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5800 Series", kUakari }, + { 0x689C, 0x00000000, CHIP_FAMILY_HEMLOCK, "ATI Radeon HD 5900 Series", kUakari }, + { 0x689E, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5800 Series", kUakari }, { 0x68A0, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNomascus }, // CHIP_FAMILY_BROADWAY ?? { 0x68A1, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNomascus }, // CHIP_FAMILY_BROADWAY ?? + { 0x68A8, 0x00000000, CHIP_FAMILY_CYPRESS, "AMD Mobility Radeon HD 6800 Series", kUakari }, + { 0x68B0, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNull }, // CHIP_FAMILY_BROADWAY ?? { 0x68B8, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet }, { 0x68B9, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5600 Series", kVervet }, { 0x68BA, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6700 Series", kVervet }, + { 0x68BE, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet }, { 0x68BF, 0x00000000, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6700 Series", kVervet }, @@ -758,6 +764,7 @@ { 0x68E0, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Mobility Radeon HD 5400 Series", kEulemur }, { 0x68E1, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Mobility Radeon HD 5400 Series", kEulemur }, + { 0x68E4, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Radeon HD 6300M Series", kNull }, { 0x68F9, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5400 Series", kNull }, @@ -774,6 +781,7 @@ { 0x6738, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870 Series", kDuckweed }, { 0x6739, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850 Series", kDuckweed }, + { 0x673E, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790 Series", kNull }, { 0x6740, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6700M Series", kNull }, @@ -783,11 +791,11 @@ { 0x6758, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670 Series", kBulrushes }, { 0x6759, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570/7570 Series", kNull }, - { 0x6760, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6400M Series", kNull }, { 0x6761, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6430M Series", kNull }, { 0x6770, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6400 Series", kNull }, + { 0x6779, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450 Series", kBulrushes }, /* Southen Islands */ Index: branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c =================================================================== --- branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c (revision 1899) +++ branches/ErmaC/Modules/i386/modules/NVIDIAGraphicsEnabler/nvidia.c (revision 1900) @@ -628,6 +628,7 @@ // 0890 - 089F // 08A0 - 08AF { 0x10DE08A0, "GeForce 320M" }, + { 0x10DE08A3, "GeForce 320M" }, { 0x10DE08A4, "GeForce 320M" }, // 08B0 - 08BF // 08C0 - 08CF @@ -786,6 +787,7 @@ { 0x10DE0DE2, "GeForce GT 420" }, { 0x10DE0DE5, "GeForce GT 530" }, { 0x10DE0DE9, "GeForce GT 600M" }, // + { 0x10DE0DEA, "GeForce GT 610M" }, { 0x10DE0DEB, "GeForce GT 555M" }, { 0x10DE0DEC, "GeForce GT 525M" }, { 0x10DE0DED, "GeForce GT 520M" }, @@ -858,8 +860,9 @@ { 0x10DE1050, "GeForce GT 520M" }, { 0x10DE1051, "GeForce GT 520MX" }, { 0x10DE1054, "GeForce GT 410M" }, - { 0x10DE1056, "NVS 4200M" }, - { 0x10DE1057, "NVS 4200M" }, + { 0x10DE1055, "GeForce 410M" }, + { 0x10DE1056, "Quadro NVS 4200M" }, + { 0x10DE1057, "Quadro NVS 4200M" }, // 1060 - 106F // 1070 - 107F { 0x10DE107F, "NVIDIA GF119-ES" }, @@ -876,8 +879,8 @@ { 0x10DE108B, "GeForce GTX 590" }, // 1090 - 109F { 0x10DE1091, "Tesla M2090" }, - { 0x10DE1094, "Tesla M2075 Dual-Slot Computing Processor Module" }, // - { 0x10DE1096, "Tesla C2075" }, // + { 0x10DE1094, "Tesla M2075 Dual-Slot Computing Processor Module" }, + { 0x10DE1096, "Tesla C2075" }, { 0x10DE1098, "D13U" }, { 0x10DE109A, "Quadro 5010M" }, { 0x10DE109B, "Quadro 7000" }, @@ -892,11 +895,20 @@ // 1200 - { 0x10DE1200, "GeForce GTX 560 Ti" }, { 0x10DE1201, "GeForce GTX 560" }, - { 0x10DE1205, "GeForce GTX 460 v2" }, // GF114 + { 0x10DE1205, "GeForce GTX 460 v2" }, + { 0x10DE1208, "GeForce GTX 560 SE" }, + { 0x10DE1210, "GeForce GTX 570M" }, + { 0x10DE1211, "GeForce GTX 580M" }, + { 0x10DE1212, "GeForce GTX 675M" }, + { 0x10DE1213, "GeForce GTX 670M" }, { 0x10DE1241, "GeForce GT 545" }, { 0x10DE1243, "GeForce GT 545" }, { 0x10DE1244, "GeForce GTX 550 Ti" }, { 0x10DE1245, "GeForce GTS 450" }, + { 0x10DE1246, "GeForce GTX 550M" }, + { 0x10DE1247, "GeForce GTX 555M" }, + { 0x10DE1248, "GeForce GTX 555M" }, + { 0x10DE124D, "GeForce GTX 555M" }, { 0x10DE1251, "GeForce GTX 560M" }, }; Index: branches/ErmaC/Modules/i386/modules/IntelGraphicsEnabler/gma.c =================================================================== --- branches/ErmaC/Modules/i386/modules/IntelGraphicsEnabler/gma.c (revision 1899) +++ branches/ErmaC/Modules/i386/modules/IntelGraphicsEnabler/gma.c (revision 1900) @@ -111,6 +111,8 @@ static struct gma_gpu_t KnownGPUS[] = { { 0x00000000, "Unknown" }, + { 0x80860042, "Desktop GMA HD" }, + { 0x80860046, "Mobile GMA HD" }, { 0x808627A2, "Mobile GMA950" }, { 0x808627AE, "Mobile GMA950" }, { 0x808627A6, "Mobile GMA950" }, @@ -121,6 +123,7 @@ // { 0x8086A001, "Desktop GMA3150" }, { 0x8086A001, "Mobile GMA3150" }, { 0x8086A002, "Desktop GMA3150" }, + { 0x80862A02, "GMAX3100" }, { 0x80862A03, "GMAX3100" }, { 0x80862A12, "GMAX3100" }, @@ -183,21 +186,21 @@ devprop_add_value(device, "model", (uint8_t*)model, (strlen(model) + 1)); devprop_add_value(device, "device_type", (uint8_t*)"display", 8); - if ((model == (char *)"Mobile GMA950") - || (model == (char *)"Mobile GMA3150")) + if ((strcmp("Mobile GMA950", model) == 0) || + (strcmp("Mobile GMA3150",model) == 0)) { devprop_add_value(device, "AAPL,HasPanel", reg_TRUE, 4); devprop_add_value(device, "built-in", &BuiltIn, 1); devprop_add_value(device, "class-code", ClassFix, 4); } - else if ((model == (char *)"Desktop GMA950") - || (model == (char *)"Desktop GMA3150")) + else if ((strcmp("Desktop GMA950", model) == 0) || + (strcmp("Desktop GMA3150",model) == 0)) { BuiltIn = 0x01; devprop_add_value(device, "built-in", &BuiltIn, 1); devprop_add_value(device, "class-code", ClassFix, 4); } - else if (model == (char *)"GMAX3100") + else if (strcmp("GMAX3100",model) == 0) { devprop_add_value(device, "AAPL,HasPanel", GMAX3100_vals[0], 4); devprop_add_value(device, "AAPL,SelfRefreshSupported", GMAX3100_vals[1], 4); Index: branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c =================================================================== --- branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c (revision 1899) +++ branches/ErmaC/Modules/i386/modules/AMDGraphicsEnabler/ati.c (revision 1900) @@ -68,9 +68,11 @@ CHIP_FAMILY_TURKS, /* Southern Islands */ CHIP_FAMILY_TAHITI, -// CHIP_FAMILY_THAMES -// CHIP_FAMILY_LOMBOK -// CHIP_FAMILY_NEW_ZEALAND + CHIP_FAMILY_PITCAIRN, + CHIP_FAMILY_CAPEVERDE, +// CHIP_FAMILY_THAMES, +// CHIP_FAMILY_LOMBOK, +// CHIP_FAMILY_NEWZEALAND, CHIP_FAMILY_LAST } chip_family_t; @@ -111,9 +113,11 @@ "Turks", /* Southern Islands */ "Tahiti", -// "Thames" -// "Lombok" -// "New_Zealand" + "Pitcairn", + "CapeVerde", +// "Thames", +// "Lombok", +// "NewZealand", "" }; @@ -460,15 +464,15 @@ { 0x68B8, 0x200B1787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, { 0x68B8, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770", kVervet , 0 }, - { 0x68BA, 0x03FE1043, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, // - { 0x68BA, 0x1482174B, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, // + { 0x68BA, 0x03FE1043, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, + { 0x68BA, 0x1482174B, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, { 0x68BA, 0x174B1482, CHIP_FAMILY_JUNIPER, "ATI Sapphire Radeon HD 6770", kVervet , 0 }, - { 0x68BA, 0x200A1787, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, // - { 0x68BA, 0x21421462, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, // + { 0x68BA, 0x200A1787, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, + { 0x68BA, 0x21421462, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, { 0x68BA, 0x31501682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, - { 0x68BA, 0x31521682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, // - { 0x68BA, 0x31531682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, // - { 0x68BA, 0xE144174B, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, // + { 0x68BA, 0x31521682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, + { 0x68BA, 0x31531682, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, + { 0x68BA, 0xE144174B, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6770", kVervet , 0 }, { 0x68BE, 0x22881787, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5750", kVervet , 0 }, @@ -523,7 +527,7 @@ { 0x68F9, 0x010E1002, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, { 0x68F9, 0x03741043, CHIP_FAMILY_CEDAR, "ASUS EAH5450", kEulemur , 0 }, - { 0x68F9, 0x03CA1043, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, // + { 0x68F9, 0x03CA1043, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, { 0x68F9, 0x20091787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, { 0x68F9, 0x22911787, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, { 0x68F9, 0x23401462, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, @@ -540,20 +544,20 @@ { 0x68F9, 0xE153174B, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5450", kEulemur , 0 }, /* Northen Islands */ - { 0x6718, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull , 0 }, - { 0x6718, 0x20101458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull , 0 }, // - { 0x6718, 0x22001458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull , 0 }, // - { 0x6718, 0x23061787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull , 0 }, // - { 0x6718, 0x23701462, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull , 0 }, // - { 0x6718, 0x31301682, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull , 0 }, - { 0x6718, 0x67181002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull , 0 }, + { 0x6718, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba , 0 }, + { 0x6718, 0x20101458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba , 0 }, + { 0x6718, 0x22001458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba , 0 }, + { 0x6718, 0x23061787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba , 0 }, + { 0x6718, 0x23701462, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba , 0 }, + { 0x6718, 0x31301682, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba , 0 }, + { 0x6718, 0x67181002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kGibba , 0 }, - { 0x6719, 0x03D41043, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull , 0 }, // + { 0x6719, 0x03D41043, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull , 0 }, { 0x6719, 0x0B001002, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba , 0 }, { 0x6719, 0x186B174B, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull , 0 }, { 0x6719, 0x20101787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba , 0 }, { 0x6719, 0x21FD1458, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kGibba , 0 }, - { 0x6719, 0x23071787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull , 0 }, // + { 0x6719, 0x23071787, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6950", kNull , 0 }, { 0x671D, 0x0B2A1002, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull , 0 }, { 0x671D, 0x1B2A1002, CHIP_FAMILY_ANTILLES, "AMD Radeon HD 6990", kNull , 0 }, @@ -561,17 +565,17 @@ { 0x6720, 0x04901028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kElodea , 0 }, { 0x6720, 0x04BA1028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970M", kElodea , 0 }, - { 0x6720, 0x51041558, CHIP_FAMILY_BARTS, "AMD Radeon HD 6990M", kElodea , 0 }, // ?? + { 0x6720, 0x51041558, CHIP_FAMILY_BARTS, "AMD Radeon HD 6990M", kElodea , 0 }, { 0x6738, 0x00D01002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, - { 0x6738, 0x03AE1043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, // - { 0x6738, 0x03C61043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, // + { 0x6738, 0x03AE1043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, + { 0x6738, 0x03C61043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6738, 0x174B174B, CHIP_FAMILY_BARTS, "Sapphire Radeon HD6870", kBulrushes , 0 }, { 0x6738, 0x20101787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6738, 0x21FA1002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6738, 0x21FA1458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6738, 0x23051787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, - { 0x6738, 0x25101462, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, // + { 0x6738, 0x25101462, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6738, 0x31031682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6738, 0x31041682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, { 0x6738, 0x31071682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed , 0 }, @@ -581,17 +585,17 @@ { 0x6739, 0x03B41043, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, { 0x6739, 0x21F81458, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kBulrushes , 0 }, - { 0x6739, 0x23041787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, // + { 0x6739, 0x23041787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, { 0x6739, 0x24411462, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, { 0x6739, 0x31101682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, { 0x6739, 0x67391002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, { 0x6739, 0xAA881002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, { 0x6739, 0xE177174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850", kDuckweed , 0 }, - { 0x673E, 0x174B174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull , 0 }, // - { 0x673E, 0x23101787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull , 0 }, // - { 0x673E, 0x31701682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull , 0 }, // - { 0x673E, 0x31721682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull , 0 }, // + { 0x673E, 0x174B174B, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull , 0 }, + { 0x673E, 0x23101787, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull , 0 }, + { 0x673E, 0x31701682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull , 0 }, + { 0x673E, 0x31721682, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790", kNull , 0 }, { 0x6740, 0x04A31028, CHIP_FAMILY_TURKS, "Dell HD 6770M", kNull , 0 }, // ?? { 0x6740, 0x1D121043, CHIP_FAMILY_TURKS, "AMD Radeon HD 6730M", kNull , 0 }, @@ -621,42 +625,50 @@ { 0x6759, 0xE193174B, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570", kNull , 0 }, { 0x6760, 0x00031179, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull , 0 }, - - { 0x6760, 0x00031179, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull , 0 }, - { 0x6760, 0x04CC1028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6490M", kNull , 0 }, + { 0x6760, 0x04C11028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull , 0 }, + { 0x6760, 0x04CA1028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull , 0 }, + { 0x6760, 0x04CC1028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull , 0 }, + { 0x6760, 0x101C1043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450M", kNull , 0 }, { 0x6760, 0x165A103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull , 0 }, { 0x6760, 0x167D103C, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull , 0 }, { 0x6760, 0x1CB21043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6470M", kNull , 0 }, - { 0x6779, 0x00001002, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // - { 0x6779, 0x03DA1043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // - { 0x6779, 0x03DC1043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // - { 0x6779, 0x20121787, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // - { 0x6779, 0x21201028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // - { 0x6779, 0x21251462, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // - { 0x6779, 0x22031458, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // - { 0x6779, 0x22041458, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // - { 0x6779, 0x23111787, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // - { 0x6779, 0x32001682, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // + { 0x6779, 0x00001002, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0x03DA1043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0x03DC1043, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0x20121787, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0x21201028, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0x21251462, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0x22031458, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0x22041458, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0x23111787, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0x32001682, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, { 0x6779, 0x64501092, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, - { 0x6779, 0x909D1B0A, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // + { 0x6779, 0x909D1B0A, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, { 0x6779, 0xE164174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, { 0x6779, 0xE180174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kPithecia , 0 }, - { 0x6779, 0xE190174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // - { 0x6779, 0xE199174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, // + { 0x6779, 0xE190174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, + { 0x6779, 0xE199174B, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450", kBulrushes , 0 }, /* Southen Islands */ - { 0x6798, 0x04181043, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, // - { 0x6798, 0x04201043, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, // - { 0x6798, 0x0B001002, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, // - { 0x6798, 0x201C1787, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, // - { 0x6798, 0x254D1458, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, // - { 0x6798, 0x32101682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, // - { 0x6798, 0x32111682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, // - { 0x6798, 0x32121682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, // - { 0x6798, 0x32131682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, // + { 0x6798, 0x04181043, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, + { 0x6798, 0x04201043, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, + { 0x6798, 0x0B001002, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, + { 0x6798, 0x201C1787, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, + { 0x6798, 0x254D1458, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, + { 0x6798, 0x32101682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, + { 0x6798, 0x32111682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, + { 0x6798, 0x32121682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, + { 0x6798, 0x32131682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970", kNull , 0 }, + { 0x679A, 0x0B001002, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull , 0 }, + { 0x679A, 0x23161787, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull , 0 }, + { 0x679A, 0x254C1458, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull , 0 }, + { 0x679A, 0x27601462, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull , 0 }, + { 0x679A, 0x32211682, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull , 0 }, + { 0x679A, 0xE207174B, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950", kNull , 0 }, + /* standard/default models */ { 0x9400, 0x00000000, CHIP_FAMILY_R600, "ATI Radeon HD 2900 XT", kNull , 0 }, { 0x9405, 0x00000000, CHIP_FAMILY_R600, "ATI Radeon HD 2900 GT", kNull , 0 }, @@ -731,17 +743,22 @@ { 0x6898, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5800 Series", kUakari , 0 }, { 0x6899, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5800 Series", kUakari , 0 }, + { 0x689C, 0x00000000, CHIP_FAMILY_HEMLOCK, "ATI Radeon HD 5900 Series", kUakari , 0 }, + { 0x689E, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5800 Series", kUakari , 0 }, { 0x68A0, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNomascus , 0 }, // CHIP_FAMILY_BROADWAY ?? { 0x68A1, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNomascus , 0 }, // CHIP_FAMILY_BROADWAY ?? + { 0x68A8, 0x00000000, CHIP_FAMILY_CYPRESS, "AMD Mobility Radeon HD 6800 Series", kUakari , 0 }, + { 0x68B0, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Mobility Radeon HD 5800 Series", kNull , 0 }, // CHIP_FAMILY_BROADWAY ?? { 0x68B8, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet , 0 }, { 0x68B9, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5600 Series", kVervet , 0 }, { 0x68BA, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6700 Series", kVervet , 0 }, + { 0x68BE, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet , 0 }, { 0x68BF, 0x00000000, CHIP_FAMILY_JUNIPER, "AMD Radeon HD 6700 Series", kVervet , 0 }, @@ -754,6 +771,7 @@ { 0x68E0, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Mobility Radeon HD 5400 Series", kEulemur , 0 }, { 0x68E1, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Mobility Radeon HD 5400 Series", kEulemur , 0 }, + { 0x68E4, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Radeon HD 6300M Series", kNull , 0 }, { 0x68F9, 0x00000000, CHIP_FAMILY_CEDAR, "ATI Radeon HD 5400 Series", kNull , 0 }, @@ -770,6 +788,7 @@ { 0x6738, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870 Series", kDuckweed , 0 }, { 0x6739, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6850 Series", kDuckweed , 0 }, + { 0x673E, 0x00000000, CHIP_FAMILY_BARTS, "AMD Radeon HD 6790 Series", kNull , 0 }, { 0x6740, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6700M Series", kNull , 0 }, @@ -779,17 +798,19 @@ { 0x6758, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6670 Series", kBulrushes , 0 }, { 0x6759, 0x00000000, CHIP_FAMILY_TURKS, "AMD Radeon HD 6570/7570 Series", kNull , 0 }, - { 0x6760, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6400M Series", kNull , 0 }, { 0x6761, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6430M Series", kNull , 0 }, { 0x6770, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6400 Series", kNull , 0 }, + { 0x6779, 0x00000000, CHIP_FAMILY_CAICOS, "AMD Radeon HD 6450 Series", kBulrushes , 0 }, /* Southen Islands */ - { 0x6798, 0x00000000, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970 Series", kNull , 0 }, + { 0x6798, 0x00000000, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7970 Series", kNull }, + { 0x679A, 0x00000000, CHIP_FAMILY_TAHITI, "AMD Radeon HD 7950 Series", kNull }, // + }; typedef struct {