Rev 3291 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3291 | Rev 3299 | ||
---|---|---|---|
Line 10... | Line 10... | ||
10 | static struct sna_fb sna_fb; |
10 | static struct sna_fb sna_fb; |
11 | static struct kgem_bo *mask_bo; |
11 | static struct kgem_bo *mask_bo; |
Line 12... | Line 12... | ||
12 | 12 | ||
Line 13... | Line -... | ||
13 | static int mask_width, mask_height; |
- | |
14 | - | ||
15 | static inline void delay(uint32_t time) |
- | |
16 | { |
- | |
17 | __asm__ __volatile__( |
- | |
18 | "int $0x40" |
- | |
19 | ::"a"(5), "b"(time) |
- | |
20 | :"memory"); |
- | |
21 | }; |
13 | static int mask_width, mask_height; |
22 | 14 | ||
23 | typedef struct __attribute__((packed)) |
15 | typedef struct __attribute__((packed)) |
24 | { |
16 | { |
25 | unsigned handle; |
17 | unsigned handle; |
Line 133... | Line 125... | ||
133 | if (gen5_render_init(sna)) |
125 | if (gen5_render_init(sna)) |
134 | backend = "Ironlake"; |
126 | backend = "Ironlake"; |
135 | } else if (sna->info->gen >= 040) { |
127 | } else if (sna->info->gen >= 040) { |
136 | if (gen4_render_init(sna)) |
128 | if (gen4_render_init(sna)) |
137 | backend = "Broadwater/Crestline"; |
129 | backend = "Broadwater/Crestline"; |
138 | /* } else if (sna->info->gen >= 030) { |
130 | } else if (sna->info->gen >= 030) { |
139 | if (gen3_render_init(sna)) |
131 | if (gen3_render_init(sna)) |
140 | backend = "gen3"; */ |
132 | backend = "gen3"; |
141 | } |
133 | } |
Line 142... | Line 134... | ||
142 | 134 | ||
143 | DBG(("%s(backend=%s, prefer_gpu=%x)\n", |
135 | DBG(("%s(backend=%s, prefer_gpu=%x)\n", |
Line 186... | Line 178... | ||
186 | 178 | ||
Line 187... | Line 179... | ||
187 | sna->info = intel_detect_chipset(sna->PciInfo); |
179 | sna->info = intel_detect_chipset(sna->PciInfo); |
Line 188... | Line -... | ||
188 | - | ||
189 | kgem_init(&sna->kgem, service, sna->PciInfo, sna->info->gen); |
180 | |
190 | 181 | kgem_init(&sna->kgem, service, sna->PciInfo, sna->info->gen); |
|
191 | delay(10); |
182 | |
192 | /* |
183 | /* |
193 | if (!xf86ReturnOptValBool(sna->Options, |
184 | if (!xf86ReturnOptValBool(sna->Options, |
Line 464... | Line 455... | ||
464 | { |
455 | { |
465 | struct kgem_bo *bo; |
456 | struct kgem_bo *bo; |
466 | int width, height; |
457 | int width, height; |
467 | int i; |
458 | int i; |
Line 468... | Line 459... | ||
468 | 459 | ||
Line 469... | Line 460... | ||
469 | printf("%s width %d height %d\n", __FUNCTION__, sna_fb.width, sna_fb.height); |
460 | // printf("%s width %d height %d\n", __FUNCTION__, sna_fb.width, sna_fb.height); |
470 | 461 | ||
Line 471... | Line 462... | ||
471 | bo = kgem_create_2d(&sna_device->kgem, sna_fb.width, sna_fb.height, |
462 | bo = kgem_create_2d(&sna_device->kgem, sna_fb.width, sna_fb.height, |