[PATCH 13/19] squash drm/i915: Move out non-modeset calls from modeset init and cleanup
José Roberto de Souza
jose.souza at intel.com
Wed Jul 25 23:47:54 UTC 2018
---
drivers/gpu/drm/i915/i915_drv.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c44e9c69029b..d07951cfd741 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1433,11 +1433,24 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
return ret;
}
-void i915_driver_unload(struct drm_device *dev)
+/* unload/cleanup the leftover of i915_load_modeset_init() */
+static void i915_modeset_unload(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = to_i915(dev);
struct pci_dev *pdev = dev_priv->drm.pdev;
+ intel_bios_cleanup(dev_priv);
+
+ vga_switcheroo_unregister_client(pdev);
+ vga_client_register(pdev, NULL, NULL, NULL);
+
+ intel_csr_ucode_fini(dev_priv);
+}
+
+void i915_driver_unload(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = to_i915(dev);
+
i915_driver_unregister(dev_priv);
if (i915_gem_suspend(dev_priv))
@@ -1467,12 +1480,7 @@ void i915_driver_unload(struct drm_device *dev)
intel_cleanup_gt_powersave(dev_priv);
- intel_bios_cleanup(dev_priv);
-
- vga_switcheroo_unregister_client(pdev);
- vga_client_register(pdev, NULL, NULL, NULL);
-
- intel_csr_ucode_fini(dev_priv);
+ i915_modeset_unload(dev);
/* Free error state after interrupts are fully disabled. */
cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
--
2.18.0
More information about the Intel-gfx-trybot
mailing list