Index: trunk/i386/libsaio/gma.c =================================================================== --- trunk/i386/libsaio/gma.c (revision 2395) +++ trunk/i386/libsaio/gma.c (revision 2396) @@ -286,10 +286,10 @@ // 0091 /* ??? */ // 0092 /* ??? */ {GMA_HASWELL_D_GT1, HD_GRAPHICS }, - {GMA_HASWELL_D_GT2, HD_GRAPHICS_4600 }, + {GMA_HASWELL_D_GT2, HD_GRAPHICS_4600 }, /* 0412 */ {GMA_HASWELL_D_GT3, HD_GRAPHICS_5000 }, /* ??? */ {GMA_HASWELL_M_GT1, HD_GRAPHICS }, - {GMA_HASWELL_M_GT2, HD_GRAPHICS_4600 }, + {GMA_HASWELL_M_GT2, HD_GRAPHICS_4600 }, /* 0416 */ {GMA_HASWELL_M_GT3, HD_GRAPHICS_5000 }, /* ??? */ {GMA_HASWELL_S_GT1, HD_GRAPHICS }, {GMA_HASWELL_S_GT2, "HD Graphics P4600/P4700" }, @@ -298,45 +298,45 @@ {GMA_HASWELL_B_GT2, HD_GRAPHICS }, /* ??? */ {GMA_HASWELL_B_GT3, HD_GRAPHICS }, /* ??? */ {GMA_HASWELL_E_GT1, HD_GRAPHICS }, - {GMA_HASWELL_E_GT2, HD_GRAPHICS }, /* ??? */ + {GMA_HASWELL_E_GT2, HD_GRAPHICS_4400 }, /* 041e */ {GMA_HASWELL_E_GT3, HD_GRAPHICS }, /* ??? */ {GMA_HASWELL_ULT_D_GT1, HD_GRAPHICS }, /* ??? */ {GMA_HASWELL_ULT_D_GT2, HD_GRAPHICS }, /* ??? */ {GMA_HASWELL_ULT_D_GT3, IRIS_5100 }, {GMA_HASWELL_ULT_M_GT1, HD_GRAPHICS }, - {GMA_HASWELL_ULT_M_GT2, "HD Graphics 4400" }, - {GMA_HASWELL_ULT_M_GT3, HD_GRAPHICS_5000 }, + {GMA_HASWELL_ULT_M_GT2, HD_GRAPHICS_4400 }, /* 0a16 */ + {GMA_HASWELL_ULT_M_GT3, HD_GRAPHICS_5000 }, /* 0a26 */ {GMA_HASWELL_ULT_S_GT1, HD_GRAPHICS }, /* ??? */ {GMA_HASWELL_ULT_S_GT2, HD_GRAPHICS }, /* ??? */ {GMA_HASWELL_ULT_S_GT3, IRIS_5100 }, {GMA_HASWELL_ULT_B_GT1, HD_GRAPHICS }, /* ??? */ {GMA_HASWELL_ULT_B_GT2, HD_GRAPHICS }, /* ??? */ {GMA_HASWELL_ULT_B_GT3, IRIS_5100 }, - {GMA_HASWELL_ULT_E_GT1, HD_GRAPHICS }, - {GMA_HASWELL_ULT_E_GT2, "HD Graphics 4200" }, + {GMA_HASWELL_ULT_E_GT1, HD_GRAPHICS_4400 }, /* 0a0e */ + {GMA_HASWELL_ULT_E_GT2, HD_GRAPHICS_4200 }, /* 0a1e */ // 0A2A /* ??? */ {GMA_HASWELL_ULT_E_GT3, IRIS_5100 }, - // 0C02 /* Intel Haswell HD Graphics - GTL */ - // 0C04 /* ??? */ - // 0C06 /* Intel Haswell HD Graphics - GTL */ - // 0C12 /* Intel Haswell HD Graphics - GTM */ - // 0C16 /* Intel Haswell HD Graphics - GTH */ - // 0C22 /* Intel Haswell HD Graphics - GTH */ - // 0C26 /* Intel Haswell HD Graphics - GTH */ - {GMA_HASWELL_CRW_D_GT1, HD_GRAPHICS }, /* ??? */ + {GMA_HASWELL_SDV_D_GT1_IG, HD_GRAPHICS }, // 0C02 /* Intel Haswell HD Graphics - GTL */ + // 0C04 /* DRAM Controller */ + {GMA_HASWELL_SDV_M_GT1_IG, HD_GRAPHICS }, // 0C06 /* Intel Haswell HD Graphics - GTL */ + {GMA_HASWELL_SDV_D_GT2_IG, HD_GRAPHICS }, // 0C12 /* Intel Haswell HD Graphics - GTM */ + {GMA_HASWELL_SDV_M_GT2_IG, HD_GRAPHICS }, // 0C16 /* Intel Haswell HD Graphics - GTH */ + {GMA_HASWELL_SDV_D_GT2_PLUS_IG, HD_GRAPHICS }, // 0C22 /* Intel Haswell HD Graphics - GTH */ + {GMA_HASWELL_SDV_M_GT2_PLUS_IG, HD_GRAPHICS }, // 0C26 /* Intel Haswell HD Graphics - GTH */ + {GMA_HASWELL_CRW_D_GT1, HD_GRAPHICS }, /* 0d02 */ {GMA_HASWELL_CRW_D_GT2, HD_GRAPHICS_4600 }, - {GMA_HASWELL_CRW_D_GT3, IRIS_5200 }, - {GMA_HASWELL_CRW_M_GT1, HD_GRAPHICS }, /* ??? */ - {GMA_HASWELL_CRW_M_GT2, HD_GRAPHICS_4600 }, - {GMA_HASWELL_CRW_M_GT3, IRIS_5200 }, - {GMA_HASWELL_CRW_S_GT1, HD_GRAPHICS }, /* ??? */ - {GMA_HASWELL_CRW_S_GT2, HD_GRAPHICS }, /* ??? */ + {GMA_HASWELL_CRW_D_GT3, IRIS_5200 }, /* 0d22 */ + {GMA_HASWELL_CRW_M_GT1, HD_GRAPHICS }, /* 0d06 */ + {GMA_HASWELL_CRW_M_GT2, HD_GRAPHICS_4600 }, /* 0d16 */ + {GMA_HASWELL_CRW_M_GT3, IRIS_5200 }, /* 0d26 */ + {GMA_HASWELL_CRW_S_GT1, HD_GRAPHICS }, /* 0d0a */ + {GMA_HASWELL_CRW_S_GT2, HD_GRAPHICS }, /* 0d1a */ {GMA_HASWELL_CRW_S_GT3, IRIS_5200 }, - {GMA_HASWELL_CRW_B_GT1, HD_GRAPHICS }, /* ??? */ - {GMA_HASWELL_CRW_B_GT2, HD_GRAPHICS }, /* ??? */ + {GMA_HASWELL_CRW_B_GT1, HD_GRAPHICS }, /* 0d0b */ + {GMA_HASWELL_CRW_B_GT2, HD_GRAPHICS }, /* 0d1b */ {GMA_HASWELL_CRW_B_GT3, IRIS_5200 }, - {GMA_HASWELL_CRW_E_GT1, HD_GRAPHICS }, /* ??? */ - {GMA_HASWELL_CRW_E_GT2, HD_GRAPHICS }, /* ??? */ + {GMA_HASWELL_CRW_E_GT1, HD_GRAPHICS }, /* 0d0e */ + {GMA_HASWELL_CRW_E_GT2, HD_GRAPHICS }, /* od1e */ {GMA_HASWELL_CRW_E_GT3, IRIS_5200 }, {GMA_HASWELL_CRW_M_GT2_PLUS_IG, HD_GRAPHICS } }; @@ -634,12 +634,12 @@ case GMA_HASWELL_ULT_M_GT3: // 0a26 case GMA_HASWELL_ULT_S_GT3: // 0a2a case GMA_HASWELL_ULT_E_GT3: // 0a2e - //case GMA_HASWELL_SDV_D_GT1_IG: // 0c02 - //case GMA_HASWELL_SDV_M_GT1_IG: // 0c06 - //case GMA_HASWELL_SDV_D_GT2_IG: // 0c12 - //case GMA_HASWELL_SDV_M_GT2_IG: // 0c16 - //case GMA_HASWELL_SDV_D_GT2_PLUS_IG: // 0c22 - //case GMA_HASWELL_SDV_M_GT2_PLUS_IG: // 0c26 + case GMA_HASWELL_SDV_D_GT1_IG: // 0c02 + case GMA_HASWELL_SDV_M_GT1_IG: // 0c06 + case GMA_HASWELL_SDV_D_GT2_IG: // 0c12 + case GMA_HASWELL_SDV_M_GT2_IG: // 0c16 + case GMA_HASWELL_SDV_D_GT2_PLUS_IG: // 0c22 + case GMA_HASWELL_SDV_M_GT2_PLUS_IG: // 0c26 case GMA_HASWELL_CRW_D_GT1: // 0d02 case GMA_HASWELL_CRW_D_GT2: // 0d12 case GMA_HASWELL_CRW_D_GT3: // 0d22 Index: trunk/i386/libsaio/gma.h =================================================================== --- trunk/i386/libsaio/gma.h (revision 2395) +++ trunk/i386/libsaio/gma.h (revision 2396) @@ -60,10 +60,19 @@ #define HD_GRAPHICS_2500 "HD Graphics 2500" #define HD_GRAPHICS_3000 "HD Graphics 3000" #define HD_GRAPHICS_4000 "HD Graphics 4000" +#define HD_GRAPHICS_4200 "HD Graphics 4200" +#define HD_GRAPHICS_4400 "HD Graphics 4400" #define HD_GRAPHICS_4600 "HD Graphics 4600" #define HD_GRAPHICS_5000 "HD Graphics 5000" #define IRIS_5100 "Iris(TM) Graphics 5100" #define IRIS_5200 "Iris(TM) Pro Graphics 5200" +#define HD_GRAPHICS_5300 "HD Graphics 5300" +#define HD_GRAPHICS_5500 "HD Graphics 5500" +#define HD_GRAPHICS_5600 "HD Graphics 5600" +#define HD_GRAPHICS_6000 "HD Graphics 6000" +#define IRIS_6100 "Iris(TM) Pro Graphics 6100" +#define IRIS_6200 "Iris(TM) Pro Graphics 6200" +#define IRIS_6300 "Iris(TM) Pro Graphics 6300P" #define INTEL_VENDORID 0x8086 /* http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/tree/src/intel_driver.h */ @@ -170,15 +179,15 @@ // 0092 // AppleIntelHD5000Graphics.kext //#define GMA_HASWELL_HB GFX_MODEL_CONSTRUCT(INTEL, 0x0400) /* Desktop */ #define GMA_HASWELL_D_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0402) // -#define GMA_HASWELL_D_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0412) // AppleIntelHD5000Graphics.kext +#define GMA_HASWELL_D_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0412) // Haswell GT2 #define GMA_HASWELL_D_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0422) // //#define GMA_HASWELL_M_HB GFX_MODEL_CONSTRUCT(INTEL, 0x0404) /* Mobile */ -#define GMA_HASWELL_M_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0406) // AppleIntelHD5000Graphics.kext -#define GMA_HASWELL_M_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0416) // AppleIntelHD5000Graphics.kext -#define GMA_HASWELL_M_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0426) // AppleIntelHD5000Graphics.kext -#define GMA_HASWELL_S_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x040A) // +#define GMA_HASWELL_M_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0406) // Haswell Mobile GT1 +#define GMA_HASWELL_M_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0416) // Haswell Mobile GT2 +#define GMA_HASWELL_M_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0426) // Haswell Mobile GT3 +#define GMA_HASWELL_S_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x040A) // Intel(R) HD Graphics //#define GMA_HASWELL_S_HB GFX_MODEL_CONSTRUCT(INTEL, 0x0408) /* Server */ -#define GMA_HASWELL_S_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x041A) // +#define GMA_HASWELL_S_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x041A) // Intel(R) HD Graphics P4600/P4700 #define GMA_HASWELL_S_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x042A) // #define GMA_HASWELL_B_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x040B) #define GMA_HASWELL_B_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x041B) @@ -191,36 +200,36 @@ #define GMA_HASWELL_ULT_D_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0A12) #define GMA_HASWELL_ULT_D_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0A22) // #define GMA_HASWELL_ULT_M_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0A06) // -#define GMA_HASWELL_ULT_M_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0A16) // AppleIntelHD5000Graphics.kext -#define GMA_HASWELL_ULT_M_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0A26) // AppleIntelHD5000Graphics.kext +#define GMA_HASWELL_ULT_M_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0A16) // Haswell ULT Mobile GT2 +#define GMA_HASWELL_ULT_M_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0A26) // Haswell ULT Mobile GT3 - Intel(R) HD Graphics 5000 #define GMA_HASWELL_ULT_S_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0A0A) #define GMA_HASWELL_ULT_S_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0A1A) #define GMA_HASWELL_ULT_S_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0A2A) #define GMA_HASWELL_ULT_B_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0A0B) #define GMA_HASWELL_ULT_B_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0A1B) #define GMA_HASWELL_ULT_B_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0A2B) -#define GMA_HASWELL_ULT_E_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0A0E) // -#define GMA_HASWELL_ULT_E_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0A1E) // AppleIntelHD5000Graphics.kext -#define GMA_HASWELL_ULT_E_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0A2E) // AppleIntelHD5000Graphics.kext +#define GMA_HASWELL_ULT_E_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0A0E) // Intel(R) HD Graphics +#define GMA_HASWELL_ULT_E_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0A1E) // Intel(R) HD Graphics 4400 +#define GMA_HASWELL_ULT_E_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0A2E) // Haswell ULT E GT3 -//#define GMA_HASWELL_SDV_D_GT1_IG GFX_MODEL_CONSTRUCT(INTEL, 0C02) -//#define GMA_HASWELL_E_HB GFX_MODEL_CONSTRUCT(INTEL, 0C04) -//#define GMA_HASWELL_SDV_M_GT1_IG GFX_MODEL_CONSTRUCT(INTEL, 0C06) // AppleIntelHD5000Graphics.kext -//#define GMA_HASWELL_SDV_D_GT2_IG GFX_MODEL_CONSTRUCT(INTEL, 0C12) -//#define GMA_HASWELL_SDV_M_GT2_IG GFX_MODEL_CONSTRUCT(INTEL, 0C16) // AppleIntelHD5000Graphics.kext -//#define GMA_HASWELL_SDV_D_GT2_PLUS_IG GFX_MODEL_CONSTRUCT(INTEL, 0C22) // AppleIntelHD5000Graphics.kext -//#define GMA_HASWELL_SDV_M_GT2_PLUS_IG GFX_MODEL_CONSTRUCT(INTEL, 0C26) // AppleIntelHD5000Graphics.kext +#define GMA_HASWELL_SDV_D_GT1_IG GFX_MODEL_CONSTRUCT(INTEL, 0x0C02) +//#define GMA_HASWELL_E_HB GFX_MODEL_CONSTRUCT(INTEL, 0x0C04) // DRAM Controller +#define GMA_HASWELL_SDV_M_GT1_IG GFX_MODEL_CONSTRUCT(INTEL, 0x0C06) // Haswell SDV Mobile GT1 +#define GMA_HASWELL_SDV_D_GT2_IG GFX_MODEL_CONSTRUCT(INTEL, 0x0C12) +#define GMA_HASWELL_SDV_M_GT2_IG GFX_MODEL_CONSTRUCT(INTEL, 0x0C16) // Haswell SDV Mobile GT2 +#define GMA_HASWELL_SDV_D_GT2_PLUS_IG GFX_MODEL_CONSTRUCT(INTEL, 0x0C22) // Haswell HD Graphics - GTH +#define GMA_HASWELL_SDV_M_GT2_PLUS_IG GFX_MODEL_CONSTRUCT(INTEL, 0x0C26) // Haswell SDV Mobile GT3 //#define GMA_HASWELL_SDV_S_GT1_IG GFX_MODEL_CONSTRUCT(INTEL, 0x0C0A) //#define GMA_HASWELL_SDV_S_GT2_IG GFX_MODEL_CONSTRUCT(INTEL, 0x0C1A) //#define GMA_HASWELL_SDV_S_GT2_PLUS_IG GFX_MODEL_CONSTRUCT(INTEL, 0x0C2A) #define GMA_HASWELL_CRW_D_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0D02) -#define GMA_HASWELL_CRW_D_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0D12) // -#define GMA_HASWELL_CRW_D_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0D22) // +#define GMA_HASWELL_CRW_D_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0D12) // Intel(R) HD Graphics 5200 Drivers +#define GMA_HASWELL_CRW_D_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0D22) // Haswell CRW GT3 - Intel(R) Iris(TM) Pro Graphics 5200 //#define GMA_HASWELL_CRW_D_GT2_PLUS_IG GFX_MODEL_CONSTRUCT(INTEL, 0x0D32) -#define GMA_HASWELL_CRW_M_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0D06) -#define GMA_HASWELL_CRW_M_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0D16) // -#define GMA_HASWELL_CRW_M_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0D26) // AppleIntelHD5000Graphics.kext +#define GMA_HASWELL_CRW_M_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0D06) // Intel(R) HD Graphics 5200 +#define GMA_HASWELL_CRW_M_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0D16) // Intel(R) HD Graphics 5200 +#define GMA_HASWELL_CRW_M_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0D26) // Haswell CRW Mobile GT3 - Intel(R) Iris(TM) Pro Graphics 5200 Drivers #define GMA_HASWELL_CRW_S_GT1 GFX_MODEL_CONSTRUCT(INTEL, 0x0D0A) #define GMA_HASWELL_CRW_S_GT2 GFX_MODEL_CONSTRUCT(INTEL, 0x0D1A) #define GMA_HASWELL_CRW_S_GT3 GFX_MODEL_CONSTRUCT(INTEL, 0x0D2A) Index: trunk/i386/libsaio/hda.c =================================================================== --- trunk/i386/libsaio/hda.c (revision 2395) +++ trunk/i386/libsaio/hda.c (revision 2396) @@ -92,7 +92,8 @@ static hda_controller_devices know_hda_controller[] = { //8086 Intel Corporation - { HDA_INTEL_HASWELL, "Haswell" }, + { HDA_INTEL_HASWELL, "Haswell-ULT" }, + { HDA_INTEL_HASWELL2, "Haswell" }, { HDA_INTEL_CRYSTAL, "Crystal Well" }, { HDA_INTEL_CPT, "6 Series/C200 Series Chipset Family" }, { HDA_INTEL_PATSBURG,"C600/X79 series chipset" }, @@ -107,6 +108,7 @@ { HDA_INTEL_PCH, "5 Series/3400 Series" }, { HDA_INTEL_PCH2, "5 Series/3400 Series" }, { HDA_INTEL_SCH, "System Controller Hub (SCH Poulsbo)" }, + { HDA_INTEL_SCH2, "9 Series" }, { HDA_INTEL_LPT1, "Lynx Point" }, { HDA_INTEL_LPT2, "Lynx Point" }, { HDA_INTEL_LYNX, "Lynx Point-LP" }, @@ -581,20 +583,22 @@ * The above case are intended as for HDEF device at address 0x001B0000 ***********************************************************************/ case HDA_INTEL_HASWELL: + case HDA_INTEL_HASWELL2: case HDA_INTEL_CRYSTAL: case HDA_INTEL_CPT: case HDA_INTEL_PATSBURG: - case HDA_INTEL_PPT1: + case HDA_INTEL_PPT1: case HDA_INTEL_82801F: case HDA_INTEL_63XXESB: case HDA_INTEL_82801G: case HDA_INTEL_82801H: - case HDA_INTEL_82801I: + case HDA_INTEL_82801I: case HDA_INTEL_82801JI: case HDA_INTEL_82801JD: case HDA_INTEL_PCH: case HDA_INTEL_PCH2: - case HDA_INTEL_SCH: + case HDA_INTEL_SCH: + case HDA_INTEL_SCH2: case HDA_INTEL_LPT1: case HDA_INTEL_LPT2: case HDA_INTEL_LYNX: @@ -620,6 +624,7 @@ devprop_add_value(device, "device_type", (uint8_t *)"High Definition Audio", 22); // 0x16 devprop_add_value(device, "built-in", &BuiltIn, 1); devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-1", 10); // 0x0a + // "AFGLowPowerState" = <03000000> break; /**************************************************************************************************************** Index: trunk/i386/libsaio/hda.h =================================================================== --- trunk/i386/libsaio/hda.h (revision 2395) +++ trunk/i386/libsaio/hda.h (revision 2396) @@ -90,7 +90,8 @@ /* Intel */ #define INTEL_VENDORID 0x8086 -#define HDA_INTEL_HASWELL HDA_MODEL_CONSTRUCT(INTEL, 0x0c0c) +#define HDA_INTEL_HASWELL HDA_MODEL_CONSTRUCT(INTEL, 0x0a0c) +#define HDA_INTEL_HASWELL2 HDA_MODEL_CONSTRUCT(INTEL, 0x0c0c) #define HDA_INTEL_CRYSTAL HDA_MODEL_CONSTRUCT(INTEL, 0x0d0c) #define HDA_INTEL_CPT HDA_MODEL_CONSTRUCT(INTEL, 0x1c20) #define HDA_INTEL_PATSBURG HDA_MODEL_CONSTRUCT(INTEL, 0x1d20) @@ -105,6 +106,7 @@ #define HDA_INTEL_PCH HDA_MODEL_CONSTRUCT(INTEL, 0x3b56) #define HDA_INTEL_PCH2 HDA_MODEL_CONSTRUCT(INTEL, 0x3b57) #define HDA_INTEL_SCH HDA_MODEL_CONSTRUCT(INTEL, 0x811b) +#define HDA_INTEL_SCH2 HDA_MODEL_CONSTRUCT(INTEL, 0x8ca0) #define HDA_INTEL_LPT1 HDA_MODEL_CONSTRUCT(INTEL, 0x8d20) #define HDA_INTEL_LPT2 HDA_MODEL_CONSTRUCT(INTEL, 0x8d21) #define HDA_INTEL_LYNX HDA_MODEL_CONSTRUCT(INTEL, 0x9c20) Index: trunk/i386/libsaio/nvidia.c =================================================================== --- trunk/i386/libsaio/nvidia.c (revision 2395) +++ trunk/i386/libsaio/nvidia.c (revision 2396) @@ -1043,6 +1043,7 @@ { 0x10DE1004, "GeForce GTX 780" }, { 0x10DE1005, "GeForce GTX Titan" }, { 0x10DE100A, "GeForce GTX 780 Ti" }, + { 0x10DE100C, "GeForce GTX Titan Black" }, // 1010 - 101F { 0x10DE101F, "Tesla K20" }, // 1020 - 102F @@ -1221,6 +1222,7 @@ { 0x10DE1282, "GeForce GT 640" }, { 0x10DE1284, "GeForce GT 630" }, { 0x10DE1286, "GeForce GT 720" }, + { 0x10DE1287, "GeForce GT 730" }, // GK208 // 1290 - 129F { 0x10DE1290, "GeForce GT 730M" }, { 0x10DE1291, "GeForce GT 735M" }, @@ -1249,7 +1251,15 @@ { 0x10DE1390, "GeForce 845M" }, { 0x10DE1391, "GeForce GTX 850M" }, { 0x10DE1392, "GeForce GTX 860M" }, - { 0x10DE1393, "GeForce 840M" } + { 0x10DE1393, "GeForce 840M" }, + { 0x10DE13BA, "Quadro K2200" }, + { 0x10DE13BB, "Quadro K620" }, + { 0x10DE13BD, "Tesla M40" }, + // 12B0 - 12BF + { 0x10DE13C0, "GeForce GTX 980" }, // GM204 +// { 0x10DE13C1, "GeForce GTX 9xx" }, // GM204 + { 0x10DE13C2, "GeForce GTX 970" } // GM204 +// { 0x10DE13C3, "GeForce GTX 9xx" }, // GM204 }; static nvidia_card_info_t nvidia_card_exceptions[] = { Index: trunk/i386/libsaio/ati.c =================================================================== --- trunk/i386/libsaio/ati.c (revision 2395) +++ trunk/i386/libsaio/ati.c (revision 2396) @@ -1496,6 +1496,9 @@ // { 0x99A2, 0x00000000, CHIP_FAMILY_ARUBA, "AMD Radeon HD", kNull }, // Mobile // { 0x99A4, 0x00000000, CHIP_FAMILY_ARUBA, "AMD Radeon HD", kNull }, + { 0x665C, 0x00000000, CHIP_FAMILY_HAWAII, "AMD Radeon HD 7790", kFutomaki }, + { 0x665D, 0x00000000, CHIP_FAMILY_HAWAII, "AMD Radeon R9 260", kFutomaki }, + /* Evergreen */ // CYPRESS @@ -1523,7 +1526,7 @@ { 0x68A9, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI FirePro V5800 (FireGL)", kHoolock }, { 0x68B0, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770 Series", kHoolock }, // Mobile { 0x68B1, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770 Series", kHoolock }, - { 0x68B8, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770 Series", kHoolock }, + { 0x68B8, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770 Series", kVervet }, { 0x68B9, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kHoolock }, { 0x68BA, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 6770 Series", kHoolock }, { 0x68BC, 0x00000000, CHIP_FAMILY_JUNIPER, "AMD FireStream 9370", kHoolock },