Index: branches/ErmaC/MainTrunkPatch/i386/libsaio/gma.c =================================================================== --- branches/ErmaC/MainTrunkPatch/i386/libsaio/gma.c (revision 2141) +++ branches/ErmaC/MainTrunkPatch/i386/libsaio/gma.c (revision 2142) @@ -1,8 +1,8 @@ /* Original patch by Nawcom http://forum.voodooprojects.org/index.php/topic,1029.0.html - - Original Intel HDx000 code from valv + + Original Intel HDx000 code from valv */ #include "libsa.h" @@ -24,26 +24,26 @@ #endif uint8_t GMAX3100_vals[22][4] = { + { 0x01,0x00,0x00,0x00 }, // "AAPL,HasPanel" + { 0x01,0x00,0x00,0x00 }, // "AAPL,SelfRefreshSupported" { 0x01,0x00,0x00,0x00 }, - { 0x01,0x00,0x00,0x00 }, - { 0x01,0x00,0x00,0x00 }, { 0x00,0x00,0x00,0x08 }, { 0x64,0x00,0x00,0x00 }, - { 0x00,0x00,0x00,0x08 }, - { 0x01,0x00,0x00,0x00 }, - { 0x20,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x08 }, // "AAPL01,blackscreen-preferences" + { 0x01,0x00,0x00,0x00 }, // "AAPL01,DataJustify" + { 0x20,0x00,0x00,0x00 }, // "AAPL01,Depth" { 0x00,0x00,0x00,0x00 }, { 0x01,0x00,0x00,0x00 }, - { 0x20,0x03,0x00,0x00 }, + { 0x20,0x03,0x00,0x00 }, // "AAPL01,Height" { 0x00,0x00,0x00,0x00 }, { 0x00,0x00,0x00,0x00 }, - { 0x00,0x00,0x00,0x00 }, - { 0x08,0x52,0x00,0x00 }, - { 0x00,0x00,0x00,0x00 }, - { 0x00,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, // "AAPL01,Inverter" + { 0x08,0x52,0x00,0x00 }, // "AAPL01,InverterCurrent" + { 0x00,0x00,0x00,0x00 }, // "AAPL01,LinkFormat" + { 0x00,0x00,0x00,0x00 }, // "AAPL01,LinkType" + { 0x01,0x00,0x00,0x00 }, // "AAPL01,Pipe" { 0x01,0x00,0x00,0x00 }, - { 0x01,0x00,0x00,0x00 }, - { 0x3B,0x00,0x00,0x00 }, + { 0x3B,0x00,0x00,0x00 }, // "AAPL01,Stretch" { 0x00,0x00,0x00,0x00 } }; @@ -111,34 +111,43 @@ uint8_t reg_FALSE[] = { 0x00, 0x00, 0x00, 0x00 }; static struct gma_gpu_t KnownGPUS[] = { - { 0x00000000, "Unknown" }, + { 0x00000000, "Unknown" }, + { 0x80860042, "HD2000" }, +// { 0x80860044, "HD2000" }, //host bridge + { 0x80860046, "HD2000" }, + { 0x80862582, "GMA 915" }, + { 0x80862592, "GMA 915" }, { 0x808627A2, "Mobile GMA950" }, { 0x808627AE, "Mobile GMA950" }, - { 0x808627A6, "Mobile GMA950" }, + { 0x808627A6, "Mobile GMA950" }, //not a GPU { 0x8086A011, "Mobile GMA3150" }, { 0x8086A012, "Mobile GMA3150" }, { 0x80862772, "Desktop GMA950" }, - { 0x80862776, "Desktop GMA950" }, + { 0x80862776, "Desktop GMA950" }, //not a GPU // { 0x8086A001, "Desktop GMA3150" }, { 0x8086A001, "Mobile GMA3150" }, { 0x8086A002, "Desktop GMA3150" }, { 0x80862A02, "GMAX3100" }, - { 0x80862A03, "GMAX3100" }, + { 0x80862A03, "GMAX3100" }, //not a GPU { 0x80862A12, "GMAX3100" }, { 0x80862A13, "GMAX3100" }, { 0x80862A42, "GMAX3100" }, { 0x80862A43, "GMAX3100" }, - { 0x80860102, "Intel HD Graphics 2000" }, + { 0x80860102, "Intel HD Graphics 2000" }, { 0x80860106, "Intel HD Graphics 2000 Mobile" }, - { 0x80860112, "Intel HD Graphics 3000" }, + { 0x80860112, "Intel HD Graphics 3000" }, { 0x80860116, "Intel HD Graphics 3000 Mobile" }, - { 0x80860122, "Intel HD Graphics 3000" }, + { 0x80860122, "Intel HD Graphics 3000" }, { 0x80860126, "Intel HD Graphics 3000 Mobile" }, + { 0x80860152, "Intel HD Graphics 2500" }, + { 0x80860156, "Intel HD Graphics 2500 Mobile" }, + { 0x80860162, "Intel HD Graphics 4000" }, + { 0x80860166, "Intel HD Graphics 4000 Mobile" }, }; char *get_gma_model(uint32_t id) { - int i = 0; - + int i; + for (i = 0; i < (sizeof(KnownGPUS) / sizeof(KnownGPUS[0])); i++) { if (KnownGPUS[i].device == id) @@ -149,50 +158,51 @@ bool setup_gma_devprop(pci_dt_t *gma_dev) { - char *devicepath; + char *devicepath; volatile uint8_t *regs; - uint32_t bar[7]; - char *model; + uint32_t bar[7]; + char *model; uint8_t BuiltIn = 0x00; - uint8_t ClassFix[4] = { 0x00, 0x00, 0x03, 0x00 }; - unsigned int device_id; - + uint8_t ClassFix[4] = { 0x00, 0x00, 0x03, 0x00 }; + unsigned int device_id; + struct DevPropDevice *device = NULL; + devicepath = get_pci_dev_path(gma_dev); - + bar[0] = pci_config_read32(gma_dev->dev.addr, 0x10); regs = (uint8_t *) (bar[0] & ~0x0f); - + model = get_gma_model((gma_dev->vendor_id << 16) | gma_dev->device_id); device_id = gma_dev->device_id; - + verbose("Intel %s [%04x:%04x] :: %s\n", model, gma_dev->vendor_id, gma_dev->device_id, devicepath); - + if (!string) + { string = devprop_create_string(); - - struct DevPropDevice *device = malloc(sizeof(struct DevPropDevice)); + } + device = devprop_add_device(string, devicepath); - + if (!device) { printf("Failed initializing dev-prop string dev-entry.\n"); pause(); return false; } - + 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")) + devprop_add_value(device, "device_type", (uint8_t*)"display", 8); + + + if ((model == (char *)&"Mobile GMA950") || (model == (char *)&"Mobile GMA3150")) { 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 ((model == (char *)&"Desktop GMA950") || (model == (char *)&"Desktop GMA3150")) { BuiltIn = 0x01; devprop_add_value(device, "built-in", &BuiltIn, 1); @@ -200,92 +210,132 @@ } else if (model == (char *)&"GMAX3100") { - devprop_add_value(device, "AAPL,HasPanel", GMAX3100_vals[0], 4); + devprop_add_value(device, "AAPL,HasPanel", GMAX3100_vals[0], 4); devprop_add_value(device, "AAPL,SelfRefreshSupported", GMAX3100_vals[1], 4); devprop_add_value(device, "AAPL,aux-power-connected", GMAX3100_vals[2], 4); - devprop_add_value(device, "AAPL,backlight-control", GMAX3100_vals[3], 4); - devprop_add_value(device, "AAPL00,blackscreen-preferences", GMAX3100_vals[4], 4); + devprop_add_value(device, "AAPL,backlight-control", GMAX3100_vals[3], 4); + devprop_add_value(device, "AAPL00,blackscreen-preferences", GMAX3100_vals[4], 4); devprop_add_value(device, "AAPL01,BacklightIntensity", GMAX3100_vals[5], 4); - devprop_add_value(device, "AAPL01,blackscreen-preferences", GMAX3100_vals[6], 4); - devprop_add_value(device, "AAPL01,DataJustify", GMAX3100_vals[7], 4); - devprop_add_value(device, "AAPL01,Depth", GMAX3100_vals[8], 4); - devprop_add_value(device, "AAPL01,Dither", GMAX3100_vals[9], 4); - devprop_add_value(device, "AAPL01,DualLink", GMAX3100_vals[10], 4); - devprop_add_value(device, "AAPL01,Height", GMAX3100_vals[11], 4); - devprop_add_value(device, "AAPL01,Interlace", GMAX3100_vals[12], 4); - devprop_add_value(device, "AAPL01,Inverter", GMAX3100_vals[13], 4); - devprop_add_value(device, "AAPL01,InverterCurrent", GMAX3100_vals[14], 4); + devprop_add_value(device, "AAPL01,blackscreen-preferences", GMAX3100_vals[6], 4); + devprop_add_value(device, "AAPL01,DataJustify", GMAX3100_vals[7], 4); + devprop_add_value(device, "AAPL01,Depth", GMAX3100_vals[8], 4); + devprop_add_value(device, "AAPL01,Dither", GMAX3100_vals[9], 4); + devprop_add_value(device, "AAPL01,DualLink", GMAX3100_vals[10], 4); + devprop_add_value(device, "AAPL01,Height", GMAX3100_vals[11], 4); + devprop_add_value(device, "AAPL01,Interlace", GMAX3100_vals[12], 4); + devprop_add_value(device, "AAPL01,Inverter", GMAX3100_vals[13], 4); + devprop_add_value(device, "AAPL01,InverterCurrent", GMAX3100_vals[14], 4); devprop_add_value(device, "AAPL01,InverterCurrency", GMAX3100_vals[15], 4); - devprop_add_value(device, "AAPL01,LinkFormat", GMAX3100_vals[16], 4); - devprop_add_value(device, "AAPL01,LinkType", GMAX3100_vals[17], 4); - devprop_add_value(device, "AAPL01,Pipe", GMAX3100_vals[18], 4); - devprop_add_value(device, "AAPL01,PixelFormat", GMAX3100_vals[19], 4); - devprop_add_value(device, "AAPL01,Refresh", GMAX3100_vals[20], 4); - devprop_add_value(device, "AAPL01,Stretch", GMAX3100_vals[21], 4); - devprop_add_value(device, "class-code", ClassFix, 4); + devprop_add_value(device, "AAPL01,LinkFormat", GMAX3100_vals[16], 4); + devprop_add_value(device, "AAPL01,LinkType", GMAX3100_vals[17], 4); + devprop_add_value(device, "AAPL01,Pipe", GMAX3100_vals[18], 4); + devprop_add_value(device, "AAPL01,PixelFormat", GMAX3100_vals[19], 4); + devprop_add_value(device, "AAPL01,Refresh", GMAX3100_vals[20], 4); + devprop_add_value(device, "AAPL01,Stretch", GMAX3100_vals[21], 4); + devprop_add_value(device, "class-code", ClassFix, 4); } else if (model == (char *)&"Intel 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, "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); - devprop_add_value(device, "AAPL00,T3", HD2000_vals[3], 4); - devprop_add_value(device, "AAPL00,T4", HD2000_vals[4], 4); - devprop_add_value(device, "AAPL00,T5", HD2000_vals[5], 4); - devprop_add_value(device, "AAPL00,T6", HD2000_vals[6], 4); - devprop_add_value(device, "AAPL00,T7", HD2000_vals[7], 4); - devprop_add_value(device, "AAPL00,LinkType", HD2000_vals[8], 4); - devprop_add_value(device, "AAPL00,LinkFormat", HD2000_vals[9], 4); - devprop_add_value(device, "AAPL00,DualLink", HD2000_vals[10], 4); - devprop_add_value(device, "AAPL00,Dither", HD2000_vals[11], 4); - devprop_add_value(device, "AAPL00,DataJustify", HD3000_vals[12], 4); - devprop_add_value(device, "graphic-options", HD2000_vals[13], 4); - devprop_add_value(device, "AAPL,tbl-info", HD2000_tbl_info, 18); - devprop_add_value(device, "AAPL,os-info", HD2000_os_info, 20); + 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); + devprop_add_value(device, "AAPL00,T3", HD2000_vals[3], 4); + devprop_add_value(device, "AAPL00,T4", HD2000_vals[4], 4); + devprop_add_value(device, "AAPL00,T5", HD2000_vals[5], 4); + devprop_add_value(device, "AAPL00,T6", HD2000_vals[6], 4); + devprop_add_value(device, "AAPL00,T7", HD2000_vals[7], 4); + devprop_add_value(device, "AAPL00,LinkType", HD2000_vals[8], 4); + devprop_add_value(device, "AAPL00,LinkFormat", HD2000_vals[9], 4); + devprop_add_value(device, "AAPL00,DualLink", HD2000_vals[10], 4); + devprop_add_value(device, "AAPL00,Dither", HD2000_vals[11], 4); + devprop_add_value(device, "AAPL00,DataJustify", HD3000_vals[12], 4); + devprop_add_value(device, "graphic-options", HD2000_vals[13], 4); + devprop_add_value(device, "AAPL,tbl-info", HD2000_tbl_info, 18); + devprop_add_value(device, "AAPL,os-info", HD2000_os_info, 20); } else if (model == (char *)&"Intel HD Graphics 3000 Mobile") { - devprop_add_value(device, "class-code", ClassFix, 4); - 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); - devprop_add_value(device, "AAPL00,T3", HD3000_vals[3], 4); - devprop_add_value(device, "AAPL00,T4", HD3000_vals[4], 4); - devprop_add_value(device, "AAPL00,T5", HD3000_vals[5], 4); - devprop_add_value(device, "AAPL00,T6", HD3000_vals[6], 4); - devprop_add_value(device, "AAPL00,T7", HD3000_vals[7], 4); - devprop_add_value(device, "AAPL00,LinkType", HD3000_vals[8], 4); - devprop_add_value(device, "AAPL00,LinkFormat", HD3000_vals[9], 4); - devprop_add_value(device, "AAPL00,DualLink", HD3000_vals[10], 4); - devprop_add_value(device, "AAPL00,Dither", HD3000_vals[11], 4); - devprop_add_value(device, "AAPL00,DataJustify", HD3000_vals[12], 4); - devprop_add_value(device, "graphic-options", HD3000_vals[13], 4); - devprop_add_value(device, "AAPL,tbl-info", HD3000_tbl_info, 18); - devprop_add_value(device, "AAPL,os-info", HD3000_os_info, 20); + devprop_add_value(device, "class-code", ClassFix, 4); + 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); + devprop_add_value(device, "AAPL00,T3", HD3000_vals[3], 4); + devprop_add_value(device, "AAPL00,T4", HD3000_vals[4], 4); + devprop_add_value(device, "AAPL00,T5", HD3000_vals[5], 4); + devprop_add_value(device, "AAPL00,T6", HD3000_vals[6], 4); + devprop_add_value(device, "AAPL00,T7", HD3000_vals[7], 4); + devprop_add_value(device, "AAPL00,LinkType", HD3000_vals[8], 4); + devprop_add_value(device, "AAPL00,LinkFormat", HD3000_vals[9], 4); + devprop_add_value(device, "AAPL00,DualLink", HD3000_vals[10], 4); + devprop_add_value(device, "AAPL00,Dither", HD3000_vals[11], 4); + devprop_add_value(device, "AAPL00,DataJustify", HD3000_vals[12], 4); + devprop_add_value(device, "graphic-options", HD3000_vals[13], 4); + devprop_add_value(device, "AAPL,tbl-info", HD3000_tbl_info, 18); + devprop_add_value(device, "AAPL,os-info", HD3000_os_info, 20); } - else if (model == (char *)&"Intel HD Graphics 2000") + else if (model == (char *)&"Intel HD Graphics 4000") { - 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, "AAPL,tbl-info", HD2000_tbl_info, 18); - devprop_add_value(device, "AAPL,os-info", HD2000_os_info, 20); + 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, "AAPL,tbl-info", HD2000_tbl_info, 18); + devprop_add_value(device, "AAPL,os-info", HD2000_os_info, 20); } else if (model == (char *)&"Intel HD Graphics 3000") { - devprop_add_value(device, "built-in", &BuiltIn, 1); - devprop_add_value(device, "class-code", ClassFix, 4); + 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, "AAPL,tbl-info", HD3000_tbl_info, 18); - devprop_add_value(device, "AAPL,os-info", HD3000_os_info, 20); + 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); } - + else if (!strncmp(model, "Intel HD Graphics 2500", 12U) || !strncmp(model, "Intel HD Graphics 4000", 12U)) + { + uint32_t ig_platform_id = 0U; // Default to 0x01660000 + getIntForKey("IGPlatformId", (int*)&ig_platform_id, &bootInfo->chameleonConfig); + if (ig_platform_id > 11U) + { + ig_platform_id = 0U; + } + + if (ig_platform_id >= 5U && ig_platform_id <= 7U) + { + ig_platform_id |= 0x01620000U; + } + else + { + ig_platform_id |= 0x01660000U; + } + devprop_add_value(device, "AAPL,ig-platform-id", (uint8_t*)&ig_platform_id, sizeof ig_platform_id); +#if 0 + 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); +#endif + +#if 0 + { + DevPropDevice *meiDevice = NULL; + uint32_t mei_device_id = 0x1e3aU; + meiDevice = devprop_add_device(string, "PciRoot(0x0)/Pci(0x16,0x0)"); + if (meiDevice) + { + devprop_add_value(meiDevice, "device-id", (uint8_t*)&mei_device_id, sizeof mei_device_id); + } + else + { + printf("Failed initializing dev-prop MEIDevice.\n"); + } + } +#endif + } + stringdata = malloc(sizeof(uint8_t) * string->length); if (!stringdata) { @@ -293,9 +343,9 @@ pause(); return false; } - + memcpy(stringdata, (uint8_t*)devprop_generate_string(string), string->length); stringlength = string->length; - + return true; }