Chameleon

Chameleon Commit Details

Date:2011-07-10 05:05:38 (12 years 9 months ago)
Author:Evan Lojewski
Commit:1140
Parents: 1139
Message:Add gma code for the GMA950 / GMAX3100 (re issue 9).
Changes:
A/trunk/i386/libsaio/gma.c
A/trunk/i386/libsaio/gma.h
M/trunk/i386/libsaio/pci_setup.c
M/trunk/i386/libsaio/Makefile

File differences

trunk/i386/libsaio/Makefile
3737
3838
3939
40
40
4141
4242
4343
␉smbios.o smbios_getters.o smbios_decode.o \␊
␉fake_efi.o ext2fs.o \␊
␉hpet.o dram_controllers.o spd.o usb.o pci_setup.o \␊
␉device_inject.o nvidia.o ati.o pci_root.o \␊
␉device_inject.o nvidia.o ati.o gma.o pci_root.o \␊
␉convert.o aml_generator.o console.o␊
␊
LIBS = libsaio.a␊
trunk/i386/libsaio/gma.c
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
/*␊
Original patch by nawcom -> http://forum.voodooprojects.org/index.php/topic,1029.msg4427.html#msg4427␊
*/␊
#include "libsaio.h"␊
#include "bootstruct.h"␊
#include "pci.h"␊
#include "platform.h"␊
#include "device_inject.h"␊
#include "gma.h"␊
␊
#ifndef DEBUG_GMA␊
#define DEBUG_GMA 0␊
#endif␊
␊
#if DEBUG_GMA␊
#define DBG(x...)␉printf(x)␊
#else␊
#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 },␉␊
␉{ 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 }, ␊
␉{ 0x3B,0x00,0x00,0x00 },␊
␉{ 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" },␊
//␉{ 0x8086A001, "Desktop GMA3150" },␊
␉{ 0x8086A001, "Mobile GMA3150" },␊
␉{ 0x8086A002, "Desktop GMA3150" },␊
␉{ 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)␊
␉␉␉return KnownGPUS[i].name;␊
␉}␊
␉return KnownGPUS[0].name;␊
}␊
␊
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 };␊
␊
␉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)␊
␉{␊
␉␉printf("Failed initializing dev-prop string dev-entry.");␊
␉␉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, "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"))␊
␉{␊
␉␉BuiltIn = 0x01;␊
␉␉devprop_add_value(device, "built-in", &BuiltIn, 1);␊
␉␉devprop_add_value(device, "class-code", ClassFix, 4);␊
␉}␊
␉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);␊
␉}␊
␊
␉stringdata = malloc(sizeof(uint8_t) * string->length);␊
␉if(!stringdata)␊
␉{␊
␉␉printf("no stringdata.");␊
␉␉pause();␊
␉␉return false;␊
␉}␊
␉␊
␉memcpy(stringdata, (uint8_t*)devprop_generate_string(string), string->length);␊
␉stringlength = string->length;␊
␉␊
␉return true;␊
}␊
trunk/i386/libsaio/gma.h
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
#ifndef __LIBSAIO_GMA_H␊
#define __LIBSAIO_GMA_H␊
␊
bool setup_gma_devprop(pci_dt_t *gma_dev);␊
␊
struct gma_gpu_t {␊
␉unsigned device;␊
␉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]␊
␊
␊
#endif /* !__LIBSAIO_GMA_H */␊
trunk/i386/libsaio/pci_setup.c
22
33
44
5
56
67
78
......
5051
5152
5253
53
54
55
56
54
55
5756
5857
5958
#include "boot.h"␊
#include "bootstruct.h"␊
#include "pci.h"␊
#include "gma.h"␊
#include "nvidia.h"␊
#include "modules.h"␊
␊
␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␊
␉␉␉␉␉␉case PCI_VENDOR_ID_INTEL: ␊
␉␉␉␉␉␉␉/* message to be removed once support for these cards is added */␊
␉␉␉␉␉␉␉verbose("Intel VGA Controller [%04x:%04x] :: %s (currently NOT SUPPORTED)\n", ␊
␉␉␉␉␉␉␉␉current->vendor_id, current->device_id, devicepath);␊
␉␉␉␉␉␉␉break;␊
setup_gma_devprop(current);␊
break;␊
␉␉␉␉␉␊
␉␉␉␉␉␉case PCI_VENDOR_ID_NVIDIA: ␊
␉␉␉␉␉␉␉setup_nvidia_devprop(current);␊

Archive Download the corresponding diff file

Revision: 1140