[PATCH 5/5] Revert "load"

[José Roberto de Souza]

This reverts commit d616a99684f8f026f8e1a536c95d15df4e7867ec.
---
 drivers/gpu/drm/i915/i915_drv.c | 43 +++++++++++++++------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index b77353bc5275..62b10457eb19 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -668,15 +668,25 @@ static int i915_load_modeset_init(struct drm_device *dev)
 	/* must happen before intel_power_domains_init_hw() on VLV/CHV */
 	intel_update_rawclk(dev_priv);
 
+	intel_power_domains_init_hw(dev_priv, false);
+
 	intel_csr_ucode_init(dev_priv);
 
+	ret = intel_irq_install(dev_priv);
+	if (ret)
+		goto cleanup_csr;
+
 	intel_setup_gmbus(dev_priv);
 
 	/* Important: The output setup functions called by modeset_init need
 	 * working irqs for e.g. gmbus and dp aux transfers. */
 	ret = intel_modeset_init(dev);
 	if (ret)
-		goto cleanup_gmbus;
+		goto cleanup_irq;
+
+	ret = i915_gem_init(dev_priv);
+	if (ret)
+		goto cleanup_modeset;
 
 	intel_setup_overlay(dev_priv);
 
@@ -685,17 +695,23 @@ static int i915_load_modeset_init(struct drm_device *dev)
 
 	ret = intel_fbdev_init(dev);
 	if (ret)
-		goto cleanup_modeset;
+		goto cleanup_gem;
 
 	/* Only enable hotplug handling once the fbdev is fully set up. */
 	intel_hpd_init(dev_priv);
 
 	return 0;
 
+cleanup_gem:
+	if (i915_gem_suspend(dev_priv))
+		DRM_ERROR("failed to idle hardware; continuing to unload!\n");
+	i915_gem_fini(dev_priv);
 cleanup_modeset:
 	intel_modeset_cleanup(dev);
-cleanup_gmbus:
+cleanup_irq:
+	drm_irq_uninstall(dev);
 	intel_teardown_gmbus(dev_priv);
+cleanup_csr:
 	intel_csr_ucode_fini(dev_priv);
 	intel_power_domains_fini(dev_priv);
 	vga_switcheroo_unregister_client(pdev);
@@ -1381,22 +1397,9 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
 			goto out_cleanup_hw;
 	}
 
-	ret = intel_irq_install(dev_priv);
-	if (ret)
-		goto out_cleanup_hw;
-
-	/* i915_gem_init() call chain will call
-	 * intel_display_power_put(i915, POWER_DOMAIN_GT_IRQ);
-	 */
-	intel_power_domains_init_hw(dev_priv, false);
-
-	ret = i915_gem_init(dev_priv);
-	if (ret)
-		goto cleanup_irq;
-
 	ret = i915_load_modeset_init(&dev_priv->drm);
 	if (ret < 0)
-		goto cleanup_gem;
+		goto out_cleanup_hw;
 
 	i915_driver_register(dev_priv);
 
@@ -1410,12 +1413,6 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	return 0;
 
-cleanup_gem:
-	if (i915_gem_suspend(dev_priv))
-		DRM_ERROR("failed to idle hardware; continuing to unload!\n");
-	i915_gem_fini(dev_priv);
-cleanup_irq:
-	drm_irq_uninstall(&dev_priv->drm);
 out_cleanup_hw:
 	i915_driver_cleanup_hw(dev_priv);
 out_cleanup_mmio:
-- 
2.18.0