Chameleon

Chameleon Commit Details

Date:2015-11-02 15:35:53 (3 years 8 months ago)
Author:ErmaC
Commit:2786
Parents: 2785
Message:Update ATi, GMA and nVidia cards IDs.
Changes:
M/branches/ErmaC/Enoch/i386/libsaio/ati.c
M/branches/ErmaC/Enoch/i386/libsaio/ati.h
M/branches/ErmaC/Enoch/i386/libsaio/gma.c
M/branches/ErmaC/Enoch/i386/libsaio/gma.h
M/branches/ErmaC/Enoch/i386/libsaio/nvidia.c

File differences

branches/ErmaC/Enoch/i386/libsaio/gma.c
138138
139139
140140
141
141
142142
143143
144144
......
157157
158158
159159
160
160
161
161162
162163
163164
......
714715
715716
716717
717
718
719
718720
719721
720722
......
934936
935937
936938
937
939
938940
939941
940942
......
963965
964966
965967
966
968
967969
968970
969971
970972
971973
972974
973
975
974976
975977
976978
977979
978
980
981
982
983
984
985
986
987
988
979989
980990
981991
//0x0d260009
};
uint8_t broadwell_ig_vals[19][4] = {
uint8_t broadwell_ig_vals[20][4] = {
{ 0x00,0x00,0x06,0x16 },// 0 - 16060000 Broadwell GT1 (Intel HD Graphics)
{ 0x00,0x00,0x0e,0x16 },// 1 - 160e0000 Broadwell GT1 (Intel HD Graphics)
{ 0x00,0x00,0x16,0x16 },// 2 - 16160000 Broadwell GT2 (Intel HD Graphics 5500)
{ 0x04,0x00,0x2b,0x16 },// 15 - 162b0004 Broadwell GT3 (MacBook Pro) (Intel Iris Graphics 6100)
{ 0x04,0x00,0x26,0x16 },// 16 - 16260004 Broadwell GT3 (MacBook Air) (Intel HD Graphics 6000)
{ 0x05,0x00,0x26,0x16 },// 17 - 16260005 Broadwell GT3 (MacBook Air) (Intel HD Graphics 6000)
{ 0x06,0x00,0x26,0x16 }// 18 - 16260006 Broadwell GT3 (MacBook Air) (Intel HD Graphics 6000)
{ 0x06,0x00,0x26,0x16 },// 18 - 16260006 Broadwell GT3 (MacBook Air) (Intel HD Graphics 6000)
{ 0x07,0x00,0x22,0x16 }// 19 - 16260006 Broadwell GT3 (iMac Retina 21") (Intel Iris Pro 6200)
};
uint8_t skylake_ig_vals[12][4] = {
devprop_add_value(device, "class-code",ClassFix, 4);
// patch by ikunikun for i3-2125 and i5-2500K to enable HD3000.
if(((device_id << 16) | vendor_id) != GMA_SANDYBRIDGE_GT2) {
if(((device_id << 16) | vendor_id) != GMA_SANDYBRIDGE_GT2)
{
devprop_add_value(device, "vendor-id",(uint8_t *)INTEL_VENDORID, 4);
}
else
case GMA_BROADWELL_BDW_161A: // 161a
case GMA_BROADWELL_BDW_161D: // 161d
case GMA_BROADWELL_BDW_Y_GT2: // 161e (MacBook) Intel HD Graphics 5300
case GMA_BROADWELL_BDW_1622: // 1622
case GMA_BROADWELL_BDW_1622: // 1622 (iMac 21") Intel Iris Pro 6200
case GMA_BROADWELL_BDW_U_GT3: // 1626 (MacBook Air) Intel HD Graphics 6000
case GMA_BROADWELL_BDW_162A: // 162a
case GMA_BROADWELL_BDW_U_GT3_2: // 162b (MacBook Pro) Intel Iris Graphics 6100
}
else if (getIntForKey(kIntelBdwFB, &n_igs, &bootInfo->chameleonConfig))
{
if ((n_igs >= 0) || (n_igs <= 19))
if ((n_igs >= 0) || (n_igs <= 20))
{
verbose("\tAAPL,ig-platform-id was set in org.chameleon.Boot.plist with value %d\n", n_igs);
devprop_add_value(device, "AAPL,ig-platform-id", broadwell_ig_vals[n_igs], 4);
}
else
{
verbose("\tAAPL,ig-platform-id was set in org.chameleon.Boot.plist with bad value please choose a number between 0 and 18.\n");
verbose("\tAAPL,ig-platform-id was set in org.chameleon.Boot.plist with bad value please choose a number between 0 and 19.\n");
}
}
else
{
uint32_t ig_platform_id = 0x16160000; // set the default platform ig
uint32_t ig_platform_id;
if ( ( (device_id << 16) | vendor_id ) == GMA_BROADWELL_BDW_1622 )
{
ig_platform_id = 0x16220007; // Iris Pro 6200 (i5 5675C & i7 5775C)
}
else
{
ig_platform_id = 0x16160000; // set the default platform ig
}
devprop_add_value(device, "AAPL,ig-platform-id", (uint8_t *)&ig_platform_id, 4);
}
branches/ErmaC/Enoch/i386/libsaio/gma.h
309309
310310
311311
312
312
313313
314314
315315
......
319319
320320
321321
322
322
323323
324324
325325
#define GMA_SKYLAKE_ULX_GT1GFX_MODEL_CONSTRUCT(INTEL, 0x190E) // Intel(R) HD Graphics
#define GMA_SKYLAKE_ULX_GT2GFX_MODEL_CONSTRUCT(INTEL, 0x191E) // Intel(R) HD Graphics 515
#define GMA_SKYLAKE_DT_GT2GFX_MODEL_CONSTRUCT(INTEL, 0x1912) // Intel(R) HD Graphics 530
#define GMA_SKYLAKE_1921GFX_MODEL_CONSTRUCT(INTEL, 0x1921) // Intel(R) HD Graphics 520
#define GMA_SKYLAKE_1921GFX_MODEL_CONSTRUCT(INTEL, 0x1921) // Intel(R) HD Graphics 520
#define GMA_SKYLAKE_ULT_GT3_EGFX_MODEL_CONSTRUCT(INTEL, 0x1926) // Intel(R) Iris(TM) Graphics 540
#define GMA_SKYLAKE_ULT_GT3GFX_MODEL_CONSTRUCT(INTEL, 0x1923) // Intel(R) HD Graphics 535
#define GMA_SKYLAKE_ULT_GT3_28WGFX_MODEL_CONSTRUCT(INTEL, 0x1927) // Intel(R) Iris(TM) Graphics 550
#define GMA_SKYLAKE_GT4GFX_MODEL_CONSTRUCT(INTEL, 0x193B) // Intel(R) Iris(TM) Pro Graphics 580
#define GMA_SKYLAKE_GT3_FEGFX_MODEL_CONSTRUCT(INTEL, 0x192B) // Intel(R) Iris(TM) Graphics
#define GMA_SKYLAKE_GT2GFX_MODEL_CONSTRUCT(INTEL, 0x191B) // Intel(R) HD Graphics 530
#define GMA_SKYLAKE_192AGFX_MODEL_CONSTRUCT(INTEL, 0x192A) // Intel(R) Iris(TM) Pro Graphics P580
#define GMA_SKYLAKE_192AGFX_MODEL_CONSTRUCT(INTEL, 0x192A) // Intel(R) Iris(TM) Pro Graphics P580
#define GMA_SKYLAKE_SRW_GT4GFX_MODEL_CONSTRUCT(INTEL, 0x193A) // Intel(R) Iris(TM) Pro Graphics P580
#define GMA_SKYLAKE_WS_GT2GFX_MODEL_CONSTRUCT(INTEL, 0x191D) // Intel(R) HD Graphics P530
#define GMA_SKYLAKE_WS_GT4GFX_MODEL_CONSTRUCT(INTEL, 0x193D) // Intel(R) Iris(TM) Pro Graphics P580
branches/ErmaC/Enoch/i386/libsaio/nvidia.c
11731173
11741174
11751175
1176
11761177
11771178
11781179
......
13571358
13581359
13591360
1361
13601362
13611363
13621364
......
13731375
13741376
13751377
1376
1378
1379
13771380
13781381
13791382
// 1100 - 110F
// 1110 - 111F
// 1120 - 112F
{ 0x10DE1128,"GeForce GTX 970M" },
// 1130 - 113F
// 1140 - 114F
{ 0x10DE1140,"GeForce GT 610M" },
//{ 0x10DE1601,"Graphics Device" }, //
//{ 0x10DE1602,"Graphics Device" }, //
//{ 0x10DE1603,"Graphics Device" }, //
{ 0x10DE1617,"GeForce GTX 980M" }, //
//{ 0x10DE1630,"Graphics Device" }, //
//{ 0x10DE1631,"Graphics Device" }, //
//{ 0x10DE1780,"Graphics Device" }, //
//{ 0x10DE17BD,"Graphics Device" }, //
{ 0x10DE17BE,"GM107 CS1" }, // GM107
//{ 0x10DE17C1,"Graphics Device" }, //
//{ 0x10DE17C2,"Graphics Device" }, //
{ 0x10DE17C2,"GeForce GTX Titan X" }, //
{ 0x10DE17C8,"GeForce GTX 980 TI" },
//{ 0x10DE17EE,"Graphics Device" }, //
//{ 0x10DE17EF,"Graphics Device" }, //
{ 0x10DE17F0,"Quadro M6000" }
branches/ErmaC/Enoch/i386/libsaio/ati.c
109109
110110
111111
112
112
113
113114
114115
115116
......
398399
399400
400401
402
401403
404
402405
403406
404407
/* AMD9000Controller */
{"Exmoor",4},
{"Basset",4},
{"Greyhound",6}
{"Greyhound",6},
{"Labrador",6}
};
static radeon_card_info_t radeon_cards[] = {
//
{ 0x6900,0x00000000, CHIP_FAMILY_TOPAS,"ATI Radeon R7 M260/M265", kExmoor},
{ 0x6901,0x00000000, CHIP_FAMILY_TOPAS,"ATI Radeon R5 M255", kExmoor},
{ 0x6920,0x00000000, CHIP_FAMILY_AMETHYST,"ATI Radeon R9 M395X", kLabrador},
{ 0x6921,0x00000000, CHIP_FAMILY_AMETHYST,"ATI Radeon R9 M295X", kExmoor},
{ 0x692B,0x00000000, CHIP_FAMILY_TONGA,"ATI Firepro W7100", kBaladi},
{ 0x6938,0x00000000, CHIP_FAMILY_AMETHYST,"ATI Radeon R9 M295X", kExmoor},
{ 0x6939,0x00000000, CHIP_FAMILY_TONGA,"ATI Radeon R9 285", kBaladi},
branches/ErmaC/Enoch/i386/libsaio/ati.h
196196
197197
198198
199
199200
200201
201202
kExmoor,
kBasset,
kGreyhound,
kLabrador,
kCfgEnd
} config_name_t;

Archive Download the corresponding diff file

Revision: 2786