[PATCH 3/3] pm
Chris Wilson
chris at chris-wilson.co.uk
Fri Aug 10 20:40:54 UTC 2018
---
drivers/gpu/drm/i915/i915_drv.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c6585286e82e..6fbf6f994b7a 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1376,17 +1376,17 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
*/
dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);
- ret = i915_driver_init_early(dev_priv, ent);
- if (ret < 0)
- goto out_pci_disable;
-
intel_runtime_pm_get(dev_priv);
intel_runtime_pm_enable(dev_priv);
- ret = i915_driver_init_mmio(dev_priv);
+ ret = i915_driver_init_early(dev_priv, ent);
if (ret < 0)
goto out_runtime_pm_put;
+ ret = i915_driver_init_mmio(dev_priv);
+ if (ret < 0)
+ goto out_cleanup_early;
+
ret = i915_driver_init_hw(dev_priv);
if (ret < 0)
goto out_cleanup_mmio;
@@ -1421,11 +1421,11 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
i915_driver_cleanup_hw(dev_priv);
out_cleanup_mmio:
i915_driver_cleanup_mmio(dev_priv);
+out_cleanup_early:
+ i915_driver_cleanup_early(dev_priv);
out_runtime_pm_put:
intel_runtime_pm_disable(dev_priv);
intel_runtime_pm_put(dev_priv);
- i915_driver_cleanup_early(dev_priv);
-out_pci_disable:
pci_disable_device(pdev);
out_fini:
i915_load_error(dev_priv, "Device initialization failed (%d)\n", ret);
--
2.18.0
More information about the Intel-gfx-trybot
mailing list