[PATCH 1/1] drm/i915: Split i915_driver_unload tail over i915_driver_release

[Janusz Krzysztofik]

Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik at linux.intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c     | 22 ++++++++++------------
 drivers/gpu/drm/i915/i915_gem.c     | 22 ++++++++++++++++------
 drivers/gpu/drm/i915/i915_gem_gtt.c | 12 +++++++++---
 drivers/gpu/drm/i915/i915_gem_pm.c  | 10 +++++++++-
 drivers/gpu/drm/i915/i915_pci.c     |  4 ++++
 5 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 2c7a4318d13c..0ba475d2cba7 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1676,13 +1676,6 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
  */
 static void i915_driver_cleanup_hw(struct drm_i915_private *dev_priv)
 {
-	struct pci_dev *pdev = dev_priv->drm.pdev;
-
-	i915_perf_fini(dev_priv);
-
-	if (pdev->msi_enabled)
-		pci_disable_msi(pdev);
-
 	pm_qos_remove_request(&dev_priv->pm_qos);
 	i915_ggtt_cleanup_hw(dev_priv);
 }
@@ -1907,6 +1900,9 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
 	return 0;
 
 out_cleanup_hw:
+	i915_perf_fini(dev_priv);
+	if (pdev->msi_enabled)
+		pci_disable_msi(pdev);
 	i915_driver_cleanup_hw(dev_priv);
 out_cleanup_mmio:
 	i915_driver_cleanup_mmio(dev_priv);
@@ -1959,6 +1955,13 @@ void i915_driver_unload(struct drm_device *dev)
 	cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
 	i915_reset_error_state(dev_priv);
 
+	i915_perf_fini(dev_priv);
+}
+
+static void i915_driver_release(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = to_i915(dev);
+
 	i915_gem_fini(dev_priv);
 
 	intel_power_domains_fini_hw(dev_priv);
@@ -1968,11 +1971,6 @@ void i915_driver_unload(struct drm_device *dev)
 
 	enable_rpm_wakeref_asserts(dev_priv);
 	intel_runtime_pm_cleanup(dev_priv);
-}
-
-static void i915_driver_release(struct drm_device *dev)
-{
-	struct drm_i915_private *dev_priv = to_i915(dev);
 
 	i915_driver_cleanup_early(dev_priv);
 	i915_driver_destroy(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 7cafd5612f71..0b130c70ca7b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1920,7 +1920,8 @@ void
 i915_gem_release_mmap(struct drm_i915_gem_object *obj)
 {
 	struct drm_i915_private *i915 = to_i915(obj->base.dev);
-	intel_wakeref_t wakeref;
+	intel_wakeref_t wakeref = 0;
+	int idx;
 
 	/* Serialisation between user GTT access and our code depends upon
 	 * revoking the CPU's PTE whilst the mutex is held. The next user
@@ -1931,7 +1932,10 @@ i915_gem_release_mmap(struct drm_i915_gem_object *obj)
 	 * wakeref.
 	 */
 	lockdep_assert_held(&i915->drm.struct_mutex);
-	wakeref = intel_runtime_pm_get(i915);
+	if (drm_dev_enter(&i915->drm, &idx)) {
+		wakeref = intel_runtime_pm_get(i915);
+		drm_dev_exit(idx);
+	}
 
 	if (!obj->userfault_count)
 		goto out;
@@ -1948,7 +1952,8 @@ i915_gem_release_mmap(struct drm_i915_gem_object *obj)
 	wmb();
 
 out:
-	intel_runtime_pm_put(i915, wakeref);
+	if (wakeref)
+		intel_runtime_pm_put(i915, wakeref);
 }
 
 void i915_gem_runtime_suspend(struct drm_i915_private *dev_priv)
@@ -3983,9 +3988,13 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,
 				    struct llist_node *freed)
 {
 	struct drm_i915_gem_object *obj, *on;
-	intel_wakeref_t wakeref;
+	intel_wakeref_t wakeref = 0;
+	int idx;
 
-	wakeref = intel_runtime_pm_get(i915);
+	if (drm_dev_enter(&i915->drm, &idx)) {
+		wakeref = intel_runtime_pm_get(i915);
+		drm_dev_exit(idx);
+	}
 	llist_for_each_entry_safe(obj, on, freed, freed) {
 		struct i915_vma *vma, *vn;
 
@@ -4045,7 +4054,8 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,
 		if (on)
 			cond_resched();
 	}
-	intel_runtime_pm_put(i915, wakeref);
+	if (wakeref)
+		intel_runtime_pm_put(i915, wakeref);
 }
 
 static void i915_gem_flush_free_objects(struct drm_i915_private *i915)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 9ed41aefb456..da85f7f18ab9 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2543,10 +2543,16 @@ static int ggtt_bind_vma(struct i915_vma *vma,
 static void ggtt_unbind_vma(struct i915_vma *vma)
 {
 	struct drm_i915_private *i915 = vma->vm->i915;
-	intel_wakeref_t wakeref;
+	intel_wakeref_t wakeref = 0;
+	int idx;
 
-	with_intel_runtime_pm(i915, wakeref)
-		vma->vm->clear_range(vma->vm, vma->node.start, vma->size);
+	if (drm_dev_enter(&i915->drm, &idx)) {
+		wakeref = intel_runtime_pm_get(i915);
+		drm_dev_exit(idx);
+	}
+	vma->vm->clear_range(vma->vm, vma->node.start, vma->size);
+	if (wakeref)
+		intel_runtime_pm_put(i915, wakeref);
 }
 
 static int aliasing_gtt_bind_vma(struct i915_vma *vma,
diff --git a/drivers/gpu/drm/i915/i915_gem_pm.c b/drivers/gpu/drm/i915/i915_gem_pm.c
index fa9c2ebd966a..65029f1490e1 100644
--- a/drivers/gpu/drm/i915/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/i915_gem_pm.c
@@ -165,6 +165,7 @@ void i915_gem_suspend_late(struct drm_i915_private *i915)
 		&i915->mm.bound_list,
 		NULL
 	}, **phase;
+	int idx;
 
 	/*
 	 * Neither the BIOS, ourselves or any other kernel
@@ -194,7 +195,14 @@ void i915_gem_suspend_late(struct drm_i915_private *i915)
 	mutex_unlock(&i915->drm.struct_mutex);
 
 	intel_uc_sanitize(i915);
-	i915_gem_sanitize(i915);
+	if (drm_dev_enter(&i915->drm, &idx)) {
+		i915_gem_sanitize(i915);
+		drm_dev_exit(idx);
+	} else {
+		mutex_lock(&i915->drm.struct_mutex);
+		i915_gem_contexts_lost(i915);
+		mutex_unlock(&i915->drm.struct_mutex);
+	}
 }
 
 void i915_gem_resume(struct drm_i915_private *i915)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index d7c07a947497..6171aede6743 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -848,6 +848,10 @@ static void i915_pci_remove(struct pci_dev *pdev)
 		return;
 
 	i915_driver_unload(dev);
+
+	if (pdev->msi_enabled)
+		pci_disable_msi(pdev);
+
 	drm_dev_put(dev);
 
 	pci_set_drvdata(pdev, NULL);
-- 
2.21.0