Rev 2326 | Rev 2330 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2326 | Rev 2327 | ||
---|---|---|---|
Line 79... | Line 79... | ||
79 | 79 | ||
80 | dbgprintf("Enabled hardware status page\n"); |
80 | dbgprintf("Enabled hardware status page\n"); |
81 | return 0; |
81 | return 0; |
Line -... | Line 82... | ||
- | 82 | } |
|
- | 83 | ||
- | 84 | static int i915_load_modeset_init(struct drm_device *dev) |
|
- | 85 | { |
|
- | 86 | struct drm_i915_private *dev_priv = dev->dev_private; |
|
- | 87 | int ret; |
|
- | 88 | ||
- | 89 | ret = intel_parse_bios(dev); |
|
- | 90 | if (ret) |
|
- | 91 | DRM_INFO("failed to find VBIOS tables\n"); |
|
- | 92 | ||
- | 93 | // intel_register_dsm_handler(); |
|
- | 94 | ||
- | 95 | /* IIR "flip pending" bit means done if this bit is set */ |
|
- | 96 | if (IS_GEN3(dev) && (I915_READ(ECOSKPD) & ECO_FLIP_DONE)) |
|
- | 97 | dev_priv->flip_pending_is_done = true; |
|
- | 98 | ||
- | 99 | intel_modeset_init(dev); |
|
- | 100 | ||
- | 101 | #if 0 |
|
- | 102 | ||
- | 103 | ret = i915_load_gem_init(dev); |
|
- | 104 | if (ret) |
|
- | 105 | goto cleanup_vga_switcheroo; |
|
- | 106 | ||
- | 107 | intel_modeset_gem_init(dev); |
|
- | 108 | ||
- | 109 | ret = drm_irq_install(dev); |
|
- | 110 | if (ret) |
|
- | 111 | goto cleanup_gem; |
|
- | 112 | ||
- | 113 | /* Always safe in the mode setting case. */ |
|
- | 114 | /* FIXME: do pre/post-mode set stuff in core KMS code */ |
|
- | 115 | dev->vblank_disable_allowed = 1; |
|
- | 116 | ||
- | 117 | ret = intel_fbdev_init(dev); |
|
- | 118 | if (ret) |
|
- | 119 | goto cleanup_irq; |
|
- | 120 | ||
- | 121 | drm_kms_helper_poll_init(dev); |
|
- | 122 | ||
- | 123 | /* We're off and running w/KMS */ |
|
- | 124 | dev_priv->mm.suspended = 0; |
|
- | 125 | ||
- | 126 | #endif |
|
- | 127 | ||
- | 128 | return 0; |
|
- | 129 | ||
- | 130 | cleanup_irq: |
|
- | 131 | // drm_irq_uninstall(dev); |
|
- | 132 | cleanup_gem: |
|
- | 133 | // mutex_lock(&dev->struct_mutex); |
|
- | 134 | // i915_gem_cleanup_ringbuffer(dev); |
|
- | 135 | // mutex_unlock(&dev->struct_mutex); |
|
- | 136 | cleanup_vga_switcheroo: |
|
- | 137 | // vga_switcheroo_unregister_client(dev->pdev); |
|
- | 138 | cleanup_vga_client: |
|
- | 139 | // vga_client_register(dev->pdev, NULL, NULL, NULL); |
|
- | 140 | out: |
|
- | 141 | return ret; |
|
- | 142 | } |
|
- | 143 | ||
82 | } |
144 | |
83 | 145 | ||
84 | static void i915_pineview_get_mem_freq(struct drm_device *dev) |
146 | static void i915_pineview_get_mem_freq(struct drm_device *dev) |
85 | { |
147 | { |
Line 331... | Line 393... | ||
331 | 393 | ||
332 | /* Try to make sure MCHBAR is enabled before poking at it */ |
394 | /* Try to make sure MCHBAR is enabled before poking at it */ |
333 | // intel_setup_mchbar(dev); |
395 | // intel_setup_mchbar(dev); |
Line 334... | Line 396... | ||
334 | intel_setup_gmbus(dev); |
396 | intel_setup_gmbus(dev); |
Line 335... | Line 397... | ||
335 | 397 | ||
336 | // intel_opregion_setup(dev); |
398 | intel_opregion_setup(dev); |
Line 337... | Line 399... | ||
337 | 399 | ||
Line 382... | Line 444... | ||
382 | /* Start out suspended */ |
444 | /* Start out suspended */ |
383 | dev_priv->mm.suspended = 1; |
445 | dev_priv->mm.suspended = 1; |
Line 384... | Line 446... | ||
384 | 446 | ||
Line 385... | Line -... | ||
385 | intel_detect_pch(dev); |
- | |
386 | - | ||
387 | 447 | intel_detect_pch(dev); |
|
388 | // if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
448 | |
389 | // ret = i915_load_modeset_init(dev); |
449 | ret = i915_load_modeset_init(dev); |
390 | // if (ret < 0) { |
450 | if (ret < 0) { |
391 | // DRM_ERROR("failed to init modeset\n"); |
- | |
392 | // goto out_gem_unload; |
451 | DRM_ERROR("failed to init modeset\n"); |
Line 393... | Line 452... | ||
393 | // } |
452 | goto out_gem_unload; |
394 | // } |
453 | } |
395 | 454 |