Rev 5354 | Rev 6084 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 5354 | Rev 5367 | ||
---|---|---|---|
Line 273... | Line 273... | ||
273 | 273 | ||
274 | ret = intel_parse_bios(dev); |
274 | ret = intel_parse_bios(dev); |
275 | if (ret) |
275 | if (ret) |
Line -... | Line 276... | ||
- | 276 | DRM_INFO("failed to find VBIOS tables\n"); |
|
- | 277 | ||
276 | DRM_INFO("failed to find VBIOS tables\n"); |
278 | /* If we have > 1 VGA cards, then we need to arbitrate access |
- | 279 | * to the common VGA resources. |
|
- | 280 | * |
|
- | 281 | * If we are a secondary display controller (!PCI_DISPLAY_CLASS_VGA), |
|
- | 282 | * then we do not take part in VGA arbitration and the |
|
Line 277... | Line 283... | ||
277 | 283 | * vga_client_register() fails with -ENODEV. |
|
278 | 284 | */ |
|
279 | 285 | ||
280 | /* Initialise stolen first so that we may reserve preallocated |
286 | /* Initialise stolen first so that we may reserve preallocated |
Line 576... | Line 582... | ||
576 | * |
582 | * |
577 | * All tasks on the workqueue are expected to acquire the dev mutex |
583 | * All tasks on the workqueue are expected to acquire the dev mutex |
578 | * so there is no point in running more than one instance of the |
584 | * so there is no point in running more than one instance of the |
579 | * workqueue at any time. Use an ordered one. |
585 | * workqueue at any time. Use an ordered one. |
580 | */ |
586 | */ |
581 | dev_priv->wq = alloc_ordered_workqueue("i915", 0); |
587 | dev_priv->wq = (struct workqueue_struct *)alloc_ordered_workqueue("i915", 0); |
582 | if (dev_priv->wq == NULL) { |
588 | if (dev_priv->wq == NULL) { |
583 | DRM_ERROR("Failed to create our workqueue.\n"); |
589 | DRM_ERROR("Failed to create our workqueue.\n"); |
584 | ret = -ENOMEM; |
590 | ret = -ENOMEM; |
585 | goto out_mtrrfree; |
591 | goto out_mtrrfree; |
586 | } |
592 | } |
Line 636... | Line 642... | ||
636 | } |
642 | } |
Line 637... | Line 643... | ||
637 | 643 | ||
638 | if (IS_GEN5(dev)) |
644 | if (IS_GEN5(dev)) |
Line 639... | Line 645... | ||
639 | intel_gpu_ips_init(dev_priv); |
645 | intel_gpu_ips_init(dev_priv); |
Line 640... | Line 646... | ||
640 | 646 | ||
Line 641... | Line 647... | ||
641 | intel_runtime_pm_enable(dev_priv); |
647 | // intel_runtime_pm_enable(dev_priv); |
Line 670... | Line 676... | ||
670 | } |
676 | } |
Line 671... | Line 677... | ||
671 | 677 | ||
Line 672... | Line -... | ||
672 | - | ||
673 | intel_gpu_ips_teardown(); |
- | |
674 | - | ||
675 | /* The i915.ko module is still not prepared to be loaded when |
- | |
676 | * the power well is not enabled, so just enable it in case |
- | |
677 | * we're going to unload/reload. */ |
- | |
678 | intel_display_set_init_power(dev_priv, true); |
678 | |
Line 679... | Line 679... | ||
679 | intel_power_domains_remove(dev_priv); |
679 | intel_gpu_ips_teardown(); |
680 | 680 |