Rev 6131 | Rev 6320 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6131 | Rev 6296 | ||
|---|---|---|---|
| Line 332... | Line 332... | ||
| 332 | ret = intel_fbdev_init(dev); |
332 | ret = intel_fbdev_init(dev); |
| 333 | if (ret) |
333 | if (ret) |
| 334 | goto cleanup_gem; |
334 | goto cleanup_gem; |
| Line 335... | Line 335... | ||
| 335 | 335 | ||
| 336 | /* Only enable hotplug handling once the fbdev is fully set up. */ |
336 | /* Only enable hotplug handling once the fbdev is fully set up. */ |
| Line 337... | Line 337... | ||
| 337 | // intel_hpd_init(dev_priv); |
337 | intel_hpd_init(dev_priv); |
| 338 | 338 | ||
| 339 | /* |
339 | /* |
| 340 | * Some ports require correctly set-up hpd registers for detection to |
340 | * Some ports require correctly set-up hpd registers for detection to |
| Line 358... | Line 358... | ||
| 358 | i915_gem_context_fini(dev); |
358 | i915_gem_context_fini(dev); |
| 359 | mutex_unlock(&dev->struct_mutex); |
359 | mutex_unlock(&dev->struct_mutex); |
| 360 | cleanup_irq: |
360 | cleanup_irq: |
| 361 | // drm_irq_uninstall(dev); |
361 | // drm_irq_uninstall(dev); |
| 362 | cleanup_gem_stolen: |
362 | cleanup_gem_stolen: |
| 363 | // i915_gem_cleanup_stolen(dev); |
363 | i915_gem_cleanup_stolen(dev); |
| 364 | cleanup_vga_switcheroo: |
364 | cleanup_vga_switcheroo: |
| 365 | // vga_switcheroo_unregister_client(dev->pdev); |
365 | // vga_switcheroo_unregister_client(dev->pdev); |
| 366 | cleanup_vga_client: |
366 | cleanup_vga_client: |
| 367 | // vga_client_register(dev->pdev, NULL, NULL, NULL); |
367 | // vga_client_register(dev->pdev, NULL, NULL, NULL); |
| 368 | out: |
368 | out: |
| Line 898... | Line 898... | ||
| 898 | * |
898 | * |
| 899 | * All tasks on the workqueue are expected to acquire the dev mutex |
899 | * All tasks on the workqueue are expected to acquire the dev mutex |
| 900 | * so there is no point in running more than one instance of the |
900 | * so there is no point in running more than one instance of the |
| 901 | * workqueue at any time. Use an ordered one. |
901 | * workqueue at any time. Use an ordered one. |
| 902 | */ |
902 | */ |
| 903 | dev_priv->wq = (struct workqueue_struct *)alloc_ordered_workqueue("i915", 0); |
903 | dev_priv->wq = alloc_ordered_workqueue("i915", 0); |
| 904 | if (dev_priv->wq == NULL) { |
904 | if (dev_priv->wq == NULL) { |
| 905 | DRM_ERROR("Failed to create our workqueue.\n"); |
905 | DRM_ERROR("Failed to create our workqueue.\n"); |
| 906 | ret = -ENOMEM; |
906 | ret = -ENOMEM; |
| 907 | goto out_mtrrfree; |
907 | goto out_mtrrfree; |
| 908 | } |
908 | } |
| 909 | system_wq = dev_priv->wq; |
909 | system_wq = dev_priv->wq; |
| Line -... | Line 910... | ||
| - | 910 | ||
| - | 911 | dev_priv->hotplug.dp_wq = alloc_ordered_workqueue("i915-dp", 0); |
|
| - | 912 | if (dev_priv->hotplug.dp_wq == NULL) { |
|
| - | 913 | DRM_ERROR("Failed to create our dp workqueue.\n"); |
|
| - | 914 | ret = -ENOMEM; |
|
| - | 915 | goto out_freewq; |
|
| Line 910... | Line 916... | ||
| 910 | 916 | } |
|
| 911 | 917 | ||
| Line 912... | Line 918... | ||
| 912 | intel_irq_init(dev_priv); |
918 | intel_irq_init(dev_priv); |
| Line 969... | Line 975... | ||
| 969 | main_device = dev; |
975 | main_device = dev; |
| Line 970... | Line 976... | ||
| 970 | 976 | ||
| Line 971... | Line 977... | ||
| 971 | return 0; |
977 | return 0; |
| - | 978 | ||
| 972 | 979 | out_power_well: |
|
| Line -... | Line 980... | ||
| - | 980 | drm_vblank_cleanup(dev); |
|
| 973 | out_power_well: |
981 | out_gem_unload: |
| 974 | out_gem_unload: |
982 | |
| 975 | 983 | out_freewq: |
|
| 976 | out_mtrrfree: |
984 | out_mtrrfree: |
| 977 | out_gtt: |
985 | out_gtt: |