Re: [Intel-gfx] [PATCH 27/27] drm/i915: Drop struct_mutex from around GEM initialisation
On 25/09/2019 11:01, Chris Wilson wrote:
We no longer need to placate lockdep by holding struct_mutex for our
initialisation, so don't.
Signed-off-by: Chris Wilson
---
drivers/gpu/drm/i915/gem/i915_gem_pm.c | 2 --
drivers/gpu/drm/i915/i915_gem.c | 9 -
drivers/gpu/drm/i915/selftests/mock_gem_device.c | 7 ---
3 files changed, 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
index e04e4ff7b52e..d1ff854ee7ff 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
@@ -174,7 +174,6 @@ void i915_gem_resume(struct drm_i915_private *i915)
{
GEM_TRACE("\n");
- mutex_lock(>drm.struct_mutex);
intel_uncore_forcewake_get(>uncore, FORCEWAKE_ALL);
if (intel_gt_init_hw(>gt))
@@ -198,7 +197,6 @@ void i915_gem_resume(struct drm_i915_private *i915)
out_unlock:
intel_uncore_forcewake_put(>uncore, FORCEWAKE_ALL);
- mutex_unlock(>drm.struct_mutex);
return;
err_wedged:
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 8814db7023db..a5ef25b5b577 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1246,7 +1246,6 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
* we hold the forcewake during initialisation these problems
* just magically go away.
*/
- mutex_lock(_priv->drm.struct_mutex);
intel_uncore_forcewake_get(_priv->uncore, FORCEWAKE_ALL);
ret = i915_init_ggtt(dev_priv);
@@ -1316,7 +1315,6 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
goto err_gt;
intel_uncore_forcewake_put(_priv->uncore, FORCEWAKE_ALL);
- mutex_unlock(_priv->drm.struct_mutex);
return 0;
@@ -1327,15 +1325,11 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
* driver doesn't explode during runtime.
*/
err_gt:
- mutex_unlock(_priv->drm.struct_mutex);
-
intel_gt_set_wedged(_priv->gt);
i915_gem_suspend(dev_priv);
i915_gem_suspend_late(dev_priv);
i915_gem_drain_workqueue(dev_priv);
-
- mutex_lock(_priv->drm.struct_mutex);
err_init_hw:
intel_uc_fini_hw(_priv->gt.uc);
err_uc_init:
@@ -1350,7 +1344,6 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
intel_gt_driver_release(_priv->gt);
err_unlock:
intel_uncore_forcewake_put(_priv->uncore, FORCEWAKE_ALL);
- mutex_unlock(_priv->drm.struct_mutex);
if (ret != -EIO) {
intel_uc_cleanup_firmwares(_priv->gt.uc);
@@ -1403,10 +1396,8 @@ void i915_gem_driver_remove(struct drm_i915_private
*dev_priv)
/* Flush any outstanding unpin_work. */
i915_gem_drain_workqueue(dev_priv);
- mutex_lock(_priv->drm.struct_mutex);
intel_uc_fini_hw(_priv->gt.uc);
intel_uc_fini(_priv->gt.uc);
- mutex_unlock(_priv->drm.struct_mutex);
i915_gem_drain_freed_objects(dev_priv);
}
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 0ed21a7b8682..7950eb9825ed 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -68,10 +68,7 @@ static void mock_device_release(struct drm_device *dev)
drain_workqueue(i915->wq);
i915_gem_drain_freed_objects(i915);
- mutex_lock(>drm.struct_mutex);
mock_fini_ggtt(>ggtt);
- mutex_unlock(>drm.struct_mutex);
-
destroy_workqueue(i915->wq);
i915_gemfs_fini(i915);
@@ -180,8 +177,6 @@ struct drm_i915_private *mock_gem_device(void)
intel_timelines_init(i915);
- mutex_lock(>drm.struct_mutex);
-
mock_init_ggtt(i915, >ggtt);
mkwrite_device_info(i915)->engine_mask = BIT(0);
@@ -198,7 +193,6 @@ struct drm_i915_private *mock_gem_device(void)
goto err_context;
intel_engines_driver_register(i915);
- mutex_unlock(>drm.struct_mutex);
WARN_ON(i915_gemfs_init(i915));
@@ -209,7 +203,6 @@ struct drm_i915_private *mock_gem_device(void)
err_engine:
mock_engine_free(i915->engine[RCS0]);
err_unlock:
- mutex_unlock(>drm.struct_mutex);
intel_timelines_fini(i915);
destroy_workqueue(i915->wq);
err_drv:
Reviewed-by: Tvrtko Ursulin
Regards,
Tvrtko
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 27/27] drm/i915: Drop struct_mutex from around GEM initialisation
We no longer need to placate lockdep by holding struct_mutex for our
initialisation, so don't.
Signed-off-by: Chris Wilson
---
drivers/gpu/drm/i915/gem/i915_gem_pm.c | 2 --
drivers/gpu/drm/i915/i915_gem.c | 9 -
drivers/gpu/drm/i915/selftests/mock_gem_device.c | 7 ---
3 files changed, 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
index e04e4ff7b52e..d1ff854ee7ff 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
@@ -174,7 +174,6 @@ void i915_gem_resume(struct drm_i915_private *i915)
{
GEM_TRACE("\n");
- mutex_lock(>drm.struct_mutex);
intel_uncore_forcewake_get(>uncore, FORCEWAKE_ALL);
if (intel_gt_init_hw(>gt))
@@ -198,7 +197,6 @@ void i915_gem_resume(struct drm_i915_private *i915)
out_unlock:
intel_uncore_forcewake_put(>uncore, FORCEWAKE_ALL);
- mutex_unlock(>drm.struct_mutex);
return;
err_wedged:
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 8814db7023db..a5ef25b5b577 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1246,7 +1246,6 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
* we hold the forcewake during initialisation these problems
* just magically go away.
*/
- mutex_lock(_priv->drm.struct_mutex);
intel_uncore_forcewake_get(_priv->uncore, FORCEWAKE_ALL);
ret = i915_init_ggtt(dev_priv);
@@ -1316,7 +1315,6 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
goto err_gt;
intel_uncore_forcewake_put(_priv->uncore, FORCEWAKE_ALL);
- mutex_unlock(_priv->drm.struct_mutex);
return 0;
@@ -1327,15 +1325,11 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
* driver doesn't explode during runtime.
*/
err_gt:
- mutex_unlock(_priv->drm.struct_mutex);
-
intel_gt_set_wedged(_priv->gt);
i915_gem_suspend(dev_priv);
i915_gem_suspend_late(dev_priv);
i915_gem_drain_workqueue(dev_priv);
-
- mutex_lock(_priv->drm.struct_mutex);
err_init_hw:
intel_uc_fini_hw(_priv->gt.uc);
err_uc_init:
@@ -1350,7 +1344,6 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
intel_gt_driver_release(_priv->gt);
err_unlock:
intel_uncore_forcewake_put(_priv->uncore, FORCEWAKE_ALL);
- mutex_unlock(_priv->drm.struct_mutex);
if (ret != -EIO) {
intel_uc_cleanup_firmwares(_priv->gt.uc);
@@ -1403,10 +1396,8 @@ void i915_gem_driver_remove(struct drm_i915_private
*dev_priv)
/* Flush any outstanding unpin_work. */
i915_gem_drain_workqueue(dev_priv);
- mutex_lock(_priv->drm.struct_mutex);
intel_uc_fini_hw(_priv->gt.uc);
intel_uc_fini(_priv->gt.uc);
- mutex_unlock(_priv->drm.struct_mutex);
i915_gem_drain_freed_objects(dev_priv);
}
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 0ed21a7b8682..7950eb9825ed 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -68,10 +68,7 @@ static void mock_device_release(struct drm_device *dev)
drain_workqueue(i915->wq);
i915_gem_drain_freed_objects(i915);
- mutex_lock(>drm.struct_mutex);
mock_fini_ggtt(>ggtt);
- mutex_unlock(>drm.struct_mutex);
-
destroy_workqueue(i915->wq);
i915_gemfs_fini(i915);
@@ -180,8 +177,6 @@ struct drm_i915_private *mock_gem_device(void)
intel_timelines_init(i915);
- mutex_lock(>drm.struct_mutex);
-
mock_init_ggtt(i915, >ggtt);
mkwrite_device_info(i915)->engine_mask = BIT(0);
@@ -198,7 +193,6 @@ struct drm_i915_private *mock_gem_device(void)
goto err_context;
intel_engines_driver_register(i915);
- mutex_unlock(>drm.struct_mutex);
WARN_ON(i915_gemfs_init(i915));
@@ -209,7 +203,6 @@ struct drm_i915_private *mock_gem_device(void)
err_engine:
mock_engine_free(i915->engine[RCS0]);
err_unlock:
- mutex_unlock(>drm.struct_mutex);
intel_timelines_fini(i915);
destroy_workqueue(i915->wq);
err_drv:
--
2.23.0
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
