Chameleon

Chameleon Commit Details

Date:2014-12-31 03:09:38 (9 years 3 months ago)
Author:ErmaC
Commit:2518
Parents: 2517
Message:Add UseIntelHDMI for (hda-gfx=onboard-1 or onboard-2) that vale will be injected into the GFX0 and HDEF devices, credits Clover Team
Changes:
M/trunk/i386/libsaio/gma.c
M/trunk/package/OptionalSettings/Audio.txt
M/trunk/i386/libsaio/nvidia.c
M/trunk/i386/boot2/boot.h
M/trunk/i386/libsaio/ati.c

File differences

trunk/i386/libsaio/gma.c
5353
5454
5555
56
5657
5758
5859
......
400401
401402
402403
403
404
404
405
405406
407
408
409
410
411
412
413
414
406415
407416
408417
......
410419
411420
412421
413
422
414423
415424
416425
......
469478
470479
471480
472
481
473482
474483
475484
......
492501
493502
494503
495
504
496505
497506
498507
......
518527
519528
520529
521
522
530
531
523532
524533
525534
......
531540
532541
533542
534
535
543
544
536545
537546
538547
......
606615
607616
608617
609
618
610619
611620
612621
......
692701
693702
694703
695
704
696705
697706
698707
......
708717
709718
710719
711
720
712721
713722
714723
#define DBG(x...)␊
#endif␊
␊
static bool␉doit␉= false;␊
static uint8_t default_aapl_ivy[]␉␉=␉{ 0x05,0x00,0x62,0x01 }; // ivy_bridge_ig_vals[5]␊
#define AAPL_LEN_IVY ( sizeof(default_aapl_ivy) / sizeof(uint8_t) )␊
static uint8_t default_aapl_haswell[]␉␉=␉{ 0x00,0x00,0x26,0x0c }; // haswell_ig_vals[7]␊
␉␉return false;␊
␉}␊
␊
␉devprop_add_value(device, "model", (uint8_t*)model, (strlen(model) + 1));␊
␉devprop_add_value(device, "device_type", (uint8_t*)"display", 8);␊
␉devprop_add_value(device, "model", (uint8_t *)model, (strlen(model) + 1));␊
␉devprop_add_value(device, "device_type", (uint8_t *)"display", 8);␊
␊
␉if (getBoolForKey(kUseIntelHDMI, &doit, &bootInfo->chameleonConfig) && doit)␊
␉{␊
␉␉devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-1", 10);␊
␉}␊
␉else␊
␉{␊
␉␉devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-2", 10);␊
␉}␊
␊
␉switch ((device_id << 16) | vendor_id)␊
␉{␊
case GMA_IRONLAKE_M_G: // 0046␊
devprop_add_value(device, "built-in", &BuiltIn, 1);␊
devprop_add_value(device, "class-code", ClassFix, 4);␊
devprop_add_value(device, "hda-gfx",␉␉␉(uint8_t *)"onboard-1", 10);␊
//devprop_add_value(device, "hda-gfx",␉␉␉(uint8_t *)"onboard-1", 10);␊
devprop_add_value(device, "AAPL,os-info",␉␉␉HDx000_os_info, 20);␊
break;␊
/* 27A2, 27AE, 27A6, A001, A011, A012, */␊
/* 0106 */␊
case GMA_SANDYBRIDGE_M_GT1: // HD Graphics 2000 Mobile␊
devprop_add_value(device, "class-code", ClassFix, 4);␊
devprop_add_value(device, "hda-gfx",␉␉␉(uint8_t *)"onboard-1", 10);␊
//devprop_add_value(device, "hda-gfx",␉␉␉(uint8_t *)"onboard-1", 10);␊
devprop_add_value(device, "AAPL00,PixelFormat",␉␉HD2000_vals[0], 4);␊
devprop_add_value(device, "AAPL00,T1",␉␉␉HD2000_vals[1], 4);␊
devprop_add_value(device, "AAPL00,T2",␉␉␉HD2000_vals[2], 4);␊
case GMA_SANDYBRIDGE_M_GT2: // HD Graphics 3000 Mobile␊
case GMA_SANDYBRIDGE_M_GT2_PLUS:␊
devprop_add_value(device, "class-code",␉␉␉ClassFix, 4);␊
devprop_add_value(device, "hda-gfx",␉␉␉(uint8_t *)"onboard-1", 10);␊
//devprop_add_value(device, "hda-gfx",␉␉␉(uint8_t *)"onboard-1", 10);␊
devprop_add_value(device, "AAPL00,PixelFormat",␉␉HD3000_vals[0], 4);␊
devprop_add_value(device, "AAPL00,T1",␉␉␉HD3000_vals[1], 4);␊
devprop_add_value(device, "AAPL00,T2",␉␉␉HD3000_vals[2], 4);␊
device_id = 0x00000102;␉␉␉␉␉// Inject a valid mobile GPU device id instead of patching kexts␊
devprop_add_value(device, "built-in",␉␉␉&BuiltIn, 1);␊
devprop_add_value(device, "class-code",␉␉␉ClassFix, 4);␊
devprop_add_value(device, "device-id",␉␉␉(uint8_t*)&device_id, sizeof(device_id));␊
devprop_add_value(device, "hda-gfx",␉␉␉(uint8_t *)"onboard-1", 10);␊
devprop_add_value(device, "device-id",␉␉␉(uint8_t *)&device_id, sizeof(device_id));␊
//devprop_add_value(device, "hda-gfx",␉␉␉(uint8_t *)"onboard-1", 10);␊
devprop_add_value(device, "AAPL,tbl-info",␉␉␉HD2000_tbl_info, 18);␊
devprop_add_value(device, "AAPL,os-info",␉␉␉HD2000_os_info, 20);␊
break;␊
devprop_add_value(device, "built-in",␉␉␉&BuiltIn, 1);␊
devprop_add_value(device, "class-code",␉␉␉ClassFix, 4);␊
device_id = 0x00000126;␉␉␉␉␉// Inject a valid mobile GPU device id instead of patching kexts␊
devprop_add_value(device, "device-id",␉␉␉(uint8_t*)&device_id, sizeof(device_id));␊
devprop_add_value(device, "hda-gfx",␉␉␉(uint8_t *)"onboard-1", 10);␊
devprop_add_value(device, "device-id",␉␉␉(uint8_t *)&device_id, sizeof(device_id));␊
//devprop_add_value(device, "hda-gfx",␉␉␉(uint8_t *)"onboard-1", 10);␊
devprop_add_value(device, "AAPL,tbl-info",␉␉␉HD3000_tbl_info, 18);␊
devprop_add_value(device, "AAPL,os-info",␉␉␉HD3000_os_info, 20);␊
break;␊
␉␉devprop_add_value(device, "AAPL00,DualLink", HD4000_vals[10], 4);␊
␉␉devprop_add_value(device, "built-in", &BuiltIn, 1);␊
␉␉devprop_add_value(device, "class-code", ClassFix, 4);␊
␉␉devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-1", 10);␊
␉␉//devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-1", 10);␊
␉␉break;␊
␊
/* Haswell */␊
devprop_add_value(device, "AAPL00,DualLink", HD4000_vals[10], 4);␊
devprop_add_value(device, "built-in", &BuiltIn, 1);␊
devprop_add_value(device, "class-code", ClassFix, 4);␊
devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-1", 10);␊
//devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-1", 10);␊
break;␊
␊
default:␊
␉}␊
␊
␉verbose("---------------------------------------------\n");␊
␉memcpy(stringdata, (uint8_t*)devprop_generate_string(string), string->length);␊
␉memcpy(stringdata, (uint8_t *)devprop_generate_string(string), string->length);␊
␉stringlength = string->length;␊
␊
␉return true;␊
trunk/i386/libsaio/nvidia.c
7777
7878
7979
80
80
81
8182
8283
8384
......
20352036
20362037
20372038
2038
20392039
20402040
20412041
......
21682168
21692169
21702170
2171
2172
2173
2174
2175
2176
2177
2178
2179
21712180
21722181
21732182
#define WRITE_LE_SHORT(data) (((data) << 8 & 0xff00) | ((data) >> 8 & 0x00ff ))␊
#define WRITE_LE_INT(data) (WRITE_LE_SHORT(data) << 16 | WRITE_LE_SHORT(data >> 16))␊
␊
static bool showGeneric = false;␊
static bool␉showGeneric␉= false;␊
static bool␉doit␉␉= false;␊
char generic_name[128];␊
extern uint32_t devices_number;␊
␊
␉char␉␉␉␉kNVCAP[12];␊
␉char␉␉␉␉*model = NULL;␊
␉const char␉␉␉*value;␊
␉bool␉␉␉␉doit;␊
␊
␉fill_card_list();␊
␊
␉␉devprop_add_value(device, "@0,AAPL,boot-display", (uint8_t *)&boot_display, 4);␊
␉}␊
␊
␉if (getBoolForKey(kUseIntelHDMI, &doit, &bootInfo->chameleonConfig) && doit)␊
␉{␊
␉␉devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-2", 10);␊
␉}␊
␉else␊
␉{␊
␉␉devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-1", 10);␊
␉}␊
␊
␉if (nvPatch == PATCH_ROM_SUCCESS_HAS_LVDS)␊
␉{␊
␉␉uint8_t built_in = 0x01;␊
trunk/i386/libsaio/ati.c
77
88
99
10
1011
1112
1213
......
17051706
17061707
17071708
1708
1709
1709
1710
17101711
1711
1712
1713
1714
1715
1716
1717
1718
1712
1713
1714
1715
1716
1717
1718
1719
17191720
1720
1721
1722
1723
1724
1725
1726
1721
1722
1723
1724
1725
1726
1727
17271728
1728
1729
1730
1729
1730
1731
17311732
1732
1733
17331734
1734
1735
1736
1737
1738
1735
1736
1737
1738
1739
17391740
1740
1741
17411742
17421743
17431744
......
18661867
18671868
18681869
1869
1870
18701871
18711872
18721873
......
23282329
23292330
23302331
2331
2332
23322333
23332334
23342335
......
24342435
24352436
24362437
2438
2439
2440
2441
2442
2443
2444
2445
2446
24372447
24382448
24392449
......
24602470
24612471
24622472
2473
2474
24632475
24642476
24652477
␊
#include "ati.h"␊
␊
static bool␉doit␉= false;␊
␊
static const char *chip_family_name[] = {␊
␉"UNKNOW",␊
};␊
␊
dev_prop_t ati_devprop_list[] = {␊
␉{FLAGTRUE,␉false,␉"@0,AAPL,boot-display",␉␉get_bootdisplay_val,␉NULVAL␉␉␉␉␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"@0,ATY,EFIDisplay",␉␉NULL,␉␉␉␉␉STRVAL("TMDSA")␉␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"@0,AAPL,boot-display",␉␉get_bootdisplay_val,␉NULVAL␉␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"@0,ATY,EFIDisplay",␉␉NULL,␉␉␉STRVAL("TMDSA")␉␉␉},␊
␊
//␉{FLAGTRUE,␉true,␉"@0,AAPL,vram-memory",␉␉get_vrammemory_val,␉␉NULVAL␉␉␉␉␉␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,compatible",␉␉␉get_name_val,␉␉␉NULVAL␉␉␉␉␉␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,connector-type",␉␉get_conntype_val,␉␉NULVAL␉␉␉␉␉␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,device_type",␉␉␉NULL,␉␉␉␉␉STRVAL("display")␉␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"@0,display-connect-flags", NULL,␉␉␉␉␉DWRVAL((uint32_t)0)␉␉␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,display-type",␉␉␉NULL,␉␉␉␉␉STRVAL("NONE")␉␉␉␉␉},␊
␉{FLAGTRUE,␉true,␉"@0,name",␉␉␉␉get_name_val,␉␉␉NULVAL␉␉␉␉␉␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,VRAM,memsize",␉␉␉get_vrammemsize_val,␉NULVAL␉␉␉␉␉␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,AAPL,vram-memory",␉␉get_vrammemory_val,␉NULVAL␉␉␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,compatible",␉␉get_name_val,␉␉NULVAL␉␉␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,connector-type",␉␉get_conntype_val,␉NULVAL␉␉␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,device_type",␉␉NULL,␉␉␉STRVAL("display")␉␉},␊
//␉{FLAGTRUE,␉false,␉"@0,display-connect-flags",␉NULL,␉␉␉DWRVAL((uint32_t)0)␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,display-type",␉␉NULL,␉␉␉STRVAL("NONE")␉␉␉},␊
␉{FLAGTRUE,␉true,␉"@0,name",␉␉␉get_name_val,␉␉NULVAL␉␉␉␉},␊
//␉{FLAGTRUE,␉true,␉"@0,VRAM,memsize",␉␉get_vrammemsize_val,␉NULVAL␉␉␉␉},␊
␊
//␉{FLAGTRUE,␉false,␉"AAPL,aux-power-connected",␉␉NULL,␉␉␉␉␉DWRVAL((uint32_t)1)␉␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"AAPL,backlight-control",␉NULL,␉␉␉␉␉DWRVAL((uint32_t)0)␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"ATY,bin_image",␉␉␉get_binimage_val,␉␉NULVAL␉␉␉␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"ATY,Copyright",␉␉␉NULL,␉STRVAL("Copyright AMD Inc. All Rights Reserved. 2005-2010") },␊
␉{FLAGTRUE,␉false,␉"ATY,Card#",␉␉␉␉get_romrevision_val,␉NULVAL␉␉␉␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"ATY,VendorID",␉␉␉␉NULL,␉␉␉␉␉WRDVAL((uint16_t)0x1002)␉␉},␊
␉{FLAGTRUE,␉false,␉"ATY,DeviceID",␉␉␉␉get_deviceid_val,␉␉NULVAL␉␉␉␉␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"AAPL,aux-power-connected",␉NULL,␉␉␉DWRVAL((uint32_t)1)␉␉},␊
//␉{FLAGTRUE,␉false,␉"AAPL,backlight-control",␉NULL,␉␉␉DWRVAL((uint32_t)0)␉␉},␊
␉{FLAGTRUE,␉false,␉"ATY,bin_image",␉␉get_binimage_val,␉NULVAL␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"ATY,Copyright",␉␉NULL,␉STRVAL("Copyright AMD Inc. All Rights Reserved. 2005-2010") },␊
␉{FLAGTRUE,␉false,␉"ATY,Card#",␉␉␉get_romrevision_val,␉NULVAL␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"ATY,VendorID",␉␉␉NULL,␉␉␉WRDVAL((uint16_t)0x1002)␉},␊
␉{FLAGTRUE,␉false,␉"ATY,DeviceID",␉␉␉get_deviceid_val,␉NULVAL␉␉␉␉},␊
␊
//␉{FLAGTRUE,␉false,␉"ATY,MCLK",␉␉␉␉get_mclk_val,␉␉␉NULVAL␉␉␉␉␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"ATY,SCLK",␉␉␉␉get_sclk_val,␉␉␉NULVAL␉␉␉␉␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"ATY,RefCLK",␉␉␉␉get_refclk_val,␉␉␉DWRVAL((uint32_t)0x0a8c)␉␉},␊
//␉{FLAGTRUE,␉false,␉"ATY,MCLK",␉␉␉get_mclk_val,␉␉NULVAL␉␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"ATY,SCLK",␉␉␉get_sclk_val,␉␉NULVAL␉␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"ATY,RefCLK",␉␉␉get_refclk_val,␉␉DWRVAL((uint32_t)0x0a8c)␉},␊
␉␊
//␉{FLAGTRUE,␉false,␉"ATY,PlatformInfo",␉␉␉get_platforminfo_val,␉NULVAL␉␉␉␉␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"ATY,PlatformInfo",␉␉get_platforminfo_val,␉NULVAL␉␉␉␉},␊
␊
␉{FLAGTRUE,␉false,␉"name",␉␉␉␉␉get_nameparent_val,␉␉NULVAL␉␉␉␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"device_type",␉␉␉␉get_nameparent_val,␉␉NULVAL␉␉␉␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"model",␉␉␉␉get_model_val,␉␉␉STRVAL("ATI Radeon")␉␉␉},␊
//␉{FLAGTRUE,␉false,␉"VRAM,totalsize",␉␉␉get_vramtotalsize_val,␉NULVAL␉␉␉␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"hda-gfx",␉␉␉␉get_hdmiaudio,␉NULVAL},␊
␉{FLAGTRUE,␉false,␉"name",␉␉␉␉get_nameparent_val,␉NULVAL␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"device_type",␉␉␉get_nameparent_val,␉NULVAL␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"model",␉␉␉get_model_val,␉␉STRVAL("ATI Radeon")␉␉},␊
//␉{FLAGTRUE,␉false,␉"VRAM,totalsize",␉␉get_vramtotalsize_val,␉NULVAL␉␉␉␉},␊
␉{FLAGTRUE,␉false,␉"hda-gfx",␉␉␉get_hdmiaudio,␉␉NULVAL␉␉␉␉},␊
␊
␉{FLAGTRUE,␉false,␉NULL,␉␉␉␉␉NULL,␉␉␉␉␉NULVAL␉␉␉␉␉␉␉}␊
␉{FLAGTRUE,␉false,␉NULL,␉␉␉␉NULL,␉␉␉NULVAL␉␉␉␉}␊
};␊
␊
bool get_hdmiaudio(value_t * val)␊
␉val->type = kPtr;␊
␉val->size = strlen((char *)rev);␊
␉val->data = malloc(val->size);␊
␉␊
␊
␉if (!val->data)␊
␉{␊
␉␉return false;␊
␉␊
␉card->posted = radeon_card_posted();␊
␉verbose("ATI card %s, ", card->posted ? "POSTed" : "non-POSTed");␊
␉␊
␉verbose("\n");␊
␉get_vram_size();␊
␉␊
␉getBoolForKey(kATYbinimage, &add_vbios, &bootInfo->chameleonConfig);␊
␉}␊
␉// -------------------------------------------------␊
␊
␉if (getBoolForKey(kUseIntelHDMI, &doit, &bootInfo->chameleonConfig) && doit)␊
␉{␊
␉␉devprop_add_value(card->device, "hda-gfx", (uint8_t *)"onboard-2", 10);␊
␉}␊
␉else␊
␉{␊
␉␉devprop_add_value(card->device, "hda-gfx", (uint8_t *)"onboard-1", 10);␊
␉}␊
␊
#if 0␊
␉uint64_t fb␉= (uint32_t)card->fb;␊
␉uint64_t mmio␉= (uint32_t)card->mmio;␊
␉␉␉ati_dev->subsys_id.subsys.vendor_id, ati_dev->subsys_id.subsys.device_id,␊
␉␉␉devicepath);␊
␊
␉verbose("---------------------------------------------\n");␊
␊
␉free(card);␊
␊
␉return true;␊
trunk/i386/boot2/boot.h
124124
125125
126126
127
127128
128129
129130
␊
/* Slice: added this */␊
#define kPS2RestartFix␉␉"PS2RestartFix"␉␉/* acpi_patcher.c */␊
#define kUseIntelHDMI␉␉"UseIntelHDMI"␉␉/* ati.c && nvidia.c && gma.c */␊
␊
/* Signal64: added this key */␊
#define kLegacyOff␉␉"USBLegacyOff"␉␉/* usb.c */␊
trunk/package/OptionalSettings/Audio.txt
2626
2727
2828
29
2930
# Note: There must be a carriage return at end of last line␊
# ---------------------------------------------␊
#Bool@HDAEnabler:HDAEnabler=Yes␊
Bool@UseIntelHDMI:UseIntelHDMI=Yes␊
Bool@EnableHDMIAudio:EnableHDMIAudio=Yes␊

Archive Download the corresponding diff file

Revision: 2518