Index: trunk/i386/libsaio/gma.c =================================================================== --- trunk/i386/libsaio/gma.c (revision 1149) +++ trunk/i386/libsaio/gma.c (revision 1150) @@ -1,7 +1,10 @@ /* -Original patch by nawcom -> http://forum.voodooprojects.org/index.php/topic,1029.msg4427.html#msg4427 + Original patch by Nawcom + http://forum.voodooprojects.org/index.php/topic,1029.0.html */ -#include "libsaio.h" + +#include "libsa.h" +#include "saio_internal.h" #include "bootstruct.h" #include "pci.h" #include "platform.h" @@ -18,56 +21,60 @@ #define DBG(x...) #endif + uint8_t GMAX3100_vals[22][4] = { { 0x01,0x00,0x00,0x00 }, - { 0x01,0x00,0x00,0x00 }, - { 0x01,0x00,0x00,0x00 }, - { 0x00,0x00,0x00,0x08 }, + { 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,0x00 }, - { 0x01,0x00,0x00,0x00 }, - { 0x20,0x03,0x00,0x00 }, - { 0x00,0x00,0x00,0x00 }, - { 0x00,0x00,0x00,0x00 }, - { 0x00,0x00,0x00,0x00 }, - { 0x08,0x52,0x00,0x00 }, - { 0x00,0x00,0x00,0x00 }, - { 0x00,0x00,0x00,0x00 }, - { 0x01,0x00,0x00,0x00 }, - { 0x01,0x00,0x00,0x00 }, + { 0x20,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x01,0x00,0x00,0x00 }, + { 0x20,0x03,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x08,0x52,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x01,0x00,0x00,0x00 }, + { 0x01,0x00,0x00,0x00 }, { 0x3B,0x00,0x00,0x00 }, { 0x00,0x00,0x00,0x00 } }; -uint8_t reg_TRUE[] = { 0x01 ,0x00 ,0x00 ,0x00 }; -uint8_t reg_FALSE[] = { 0x00,0x00,0x00,0x00 }; +uint8_t reg_TRUE[] = { 0x01, 0x00, 0x00, 0x00 }; +uint8_t reg_FALSE[] = { 0x00, 0x00, 0x00, 0x00 }; + static struct gma_gpu_t KnownGPUS[] = { - { 0x00000000, "Unknown" }, - { 0x808627A2, "Mobile GMA950" }, - { 0x808627AE, "Mobile GMA950" }, - { 0x808627A6, "Mobile GMA950" }, - { 0x8086A011, "Mobile GMA3150" }, - { 0x8086A012, "Mobile GMA3150" }, - { 0x80862772, "Desktop GMA950" }, - { 0x80862776, "Desktop GMA950" }, + { 0x00000000, "Unknown" }, + { 0x808627A2, "Mobile GMA950" }, + { 0x808627AE, "Mobile GMA950" }, + { 0x808627A6, "Mobile GMA950" }, + { 0x8086A011, "Mobile GMA3150" }, + { 0x8086A012, "Mobile GMA3150" }, + { 0x80862772, "Desktop GMA950" }, + { 0x80862776, "Desktop GMA950" }, // { 0x8086A001, "Desktop GMA3150" }, - { 0x8086A001, "Mobile GMA3150" }, + { 0x8086A001, "Mobile GMA3150" }, { 0x8086A002, "Desktop GMA3150" }, - { 0x80862A02, "GMAX3100" }, - { 0x80862A03, "GMAX3100" }, - { 0x80862A12, "GMAX3100" }, - { 0x80862A13, "GMAX3100" }, - { 0x80862A42, "GMAX3100" }, - { 0x80862A43, "GMAX3100" }, + { 0x80862A02, "GMAX3100" }, + { 0x80862A03, "GMAX3100" }, + { 0x80862A12, "GMAX3100" }, + { 0x80862A13, "GMAX3100" }, + { 0x80862A42, "GMAX3100" }, + { 0x80862A43, "GMAX3100" }, }; char *get_gma_model(uint32_t id) { - int i=0; - for(i = 0; i < (sizeof(KnownGPUS) / sizeof(KnownGPUS[0])); i++) { - if(KnownGPUS[i].device == id) + int i = 0; + + for (i = 0; i < (sizeof(KnownGPUS) / sizeof(KnownGPUS[0])); i++) + { + if (KnownGPUS[i].device == id) return KnownGPUS[i].name; } return KnownGPUS[0].name; @@ -75,84 +82,84 @@ bool setup_gma_devprop(pci_dt_t *gma_dev) { - //int len; - char *devicepath; - volatile uint8_t *regs; - uint32_t bar[7]; - char *model; - uint8_t BuiltIn = 0x00; - uint8_t ClassFix[4] = { 0x00, 0x00, 0x03, 0x00 }; - + char *devicepath; + volatile uint8_t *regs; + uint32_t bar[7]; + char *model; + uint8_t BuiltIn = 0x00; + uint8_t ClassFix[4] = { 0x00, 0x00, 0x03, 0x00 }; + 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); - + 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) + if (!device) { - printf("Failed initializing dev-prop string dev-entry."); + 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")) + + 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); devprop_add_value(device, "class-code", ClassFix, 4); } - else if (model == (char *)"GMAX3100") + else if (model == (char *)"GMAX3100") { - 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, "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,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, "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, "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,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); } - + stringdata = malloc(sizeof(uint8_t) * string->length); - if(!stringdata) + if (!stringdata) { - printf("no stringdata."); + printf("No stringdata.\n"); pause(); return false; } Index: trunk/i386/libsaio/gma.h =================================================================== --- trunk/i386/libsaio/gma.h (revision 1149) +++ trunk/i386/libsaio/gma.h (revision 1150) @@ -8,9 +8,9 @@ char *name; }; -#define REG8(reg) ((volatile uint8_t *)regs)[(reg)] -#define REG16(reg) ((volatile uint16_t *)regs)[(reg) >> 1] -#define REG32(reg) ((volatile uint32_t *)regs)[(reg) >> 2] +#define REG8(reg) ((volatile uint8_t *)regs)[(reg)] +#define REG16(reg) ((volatile uint16_t *)regs)[(reg) >> 1] +#define REG32(reg) ((volatile uint32_t *)regs)[(reg) >> 2] #endif /* !__LIBSAIO_GMA_H */