Rev 2330 | Rev 2339 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2330 | Rev 2332 | ||
|---|---|---|---|
| Line -... | Line 162... | ||
| - | 162 | ||
| Line 162... | Line 163... | ||
| 162 | 163 | ||
| 163 | 164 | ||
| 164 | 165 | ||
| 165 | 166 | ||
| Line 179... | Line 180... | ||
| 179 | prealloc_size, gtt_size, mappable_size); |
180 | prealloc_size, gtt_size, mappable_size); |
| Line 180... | Line 181... | ||
| 180 | 181 | ||
| 181 | /* Basic memrange allocator for stolen space */ |
182 | /* Basic memrange allocator for stolen space */ |
| Line 182... | Line -... | ||
| 182 | drm_mm_init(&dev_priv->mm.stolen, 0, prealloc_size); |
- | |
| 183 | - | ||
| 184 | //0xC00000 >> PAGE_SHIFT |
183 | drm_mm_init(&dev_priv->mm.stolen, 0, prealloc_size); |
| 185 | 184 | ||
| 186 | /* Let GEM Manage all of the aperture. |
185 | /* Let GEM Manage all of the aperture. |
| 187 | * |
186 | * |
| 188 | * However, leave one page at the end still bound to the scratch page. |
187 | * However, leave one page at the end still bound to the scratch page. |
| 189 | * There are a number of places where the hardware apparently |
188 | * There are a number of places where the hardware apparently |
| 190 | * prefetches past the end of the object, and we've seen multiple |
189 | * prefetches past the end of the object, and we've seen multiple |
| 191 | * hangs with the GPU head pointer stuck in a batchbuffer bound |
190 | * hangs with the GPU head pointer stuck in a batchbuffer bound |
| 192 | * at the last page of the aperture. One page should be enough to |
191 | * at the last page of the aperture. One page should be enough to |
| 193 | * keep any prefetching inside of the aperture. |
192 | * keep any prefetching inside of the aperture. |
| Line 194... | Line 193... | ||
| 194 | */ |
193 | */ |
| 195 | // i915_gem_do_init(dev, 0, mappable_size, gtt_size - PAGE_SIZE); |
194 | i915_gem_do_init(dev, LFB_SIZE, mappable_size, gtt_size - PAGE_SIZE - LFB_SIZE); |
| 196 | 195 | ||
| 197 | // mutex_lock(&dev->struct_mutex); |
196 | mutex_lock(&dev->struct_mutex); |
| 198 | // ret = i915_gem_init_ringbuffer(dev); |
197 | ret = i915_gem_init_ringbuffer(dev); |
| Line 199... | Line 198... | ||
| 199 | // mutex_unlock(&dev->struct_mutex); |
198 | mutex_unlock(&dev->struct_mutex); |
| 200 | // if (ret) |
199 | if (ret) |
| 201 | // return ret; |
200 | return ret; |
| Line 238... | Line 237... | ||
| 238 | 237 | ||
| 239 | ret = i915_load_gem_init(dev); |
238 | ret = i915_load_gem_init(dev); |
| 240 | if (ret) |
239 | if (ret) |
| Line 241... | Line -... | ||
| 241 | goto cleanup_vga_switcheroo; |
- | |
| 242 | - | ||
| 243 | #if 0 |
240 | goto cleanup_vga_switcheroo; |
| Line 244... | Line 241... | ||
| 244 | 241 | ||
| 245 | intel_modeset_gem_init(dev); |
242 | intel_modeset_gem_init(dev); |
| 246 | 243 | ||
| Line 247... | Line 244... | ||
| 247 | ret = drm_irq_install(dev); |
244 | // ret = drm_irq_install(dev); |
| 248 | if (ret) |
245 | // if (ret) |
| 249 | goto cleanup_gem; |
246 | // goto cleanup_gem; |
| Line 250... | Line 247... | ||
| 250 | 247 | ||
| 251 | /* Always safe in the mode setting case. */ |
248 | /* Always safe in the mode setting case. */ |
| 252 | /* FIXME: do pre/post-mode set stuff in core KMS code */ |
249 | /* FIXME: do pre/post-mode set stuff in core KMS code */ |
| Line 253... | Line 250... | ||
| 253 | dev->vblank_disable_allowed = 1; |
250 | dev->vblank_disable_allowed = 1; |
| Line 254... | Line 251... | ||
| 254 | 251 | ||
| 255 | ret = intel_fbdev_init(dev); |
252 | ret = intel_fbdev_init(dev); |
| Line 256... | Line -... | ||
| 256 | if (ret) |
- | |
| 257 | goto cleanup_irq; |
- | |
| 258 | 253 | if (ret) |
|
| Line 259... | Line 254... | ||
| 259 | drm_kms_helper_poll_init(dev); |
254 | goto cleanup_irq; |
| 260 | 255 | ||
| 261 | /* We're off and running w/KMS */ |
256 | // drm_kms_helper_poll_init(dev); |