[PATCH v2 5/5] Revert "drm/i915: Move UC firmware cleanup from driver_release to _remove"

Janusz Krzysztofik janusz.krzysztofik at linux.intel.com
Sun Jun 7 16:46:16 UTC 2020


This reverts commit d1a5d91b06464ffc69ca4e1e6ceca6316fba55ec.
---
 drivers/gpu/drm/i915/i915_gem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 26de1d824d0c..305252ba561b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1238,8 +1238,6 @@ void i915_gem_driver_remove(struct drm_i915_private *dev_priv)
 	/* Flush any outstanding unpin_work. */
 	i915_gem_drain_workqueue(dev_priv);
 
-	intel_uc_cleanup_firmwares(&dev_priv->gt.uc);
-
 	i915_gem_drain_freed_objects(dev_priv);
 }
 
@@ -1249,6 +1247,7 @@ void i915_gem_driver_release(struct drm_i915_private *dev_priv)
 
 	intel_wa_list_free(&dev_priv->gt_wa_list);
 
+	intel_uc_cleanup_firmwares(&dev_priv->gt.uc);
 	i915_gem_cleanup_userptr(dev_priv);
 
 	i915_gem_drain_freed_objects(dev_priv);
-- 
2.21.1



More information about the Intel-gfx-trybot mailing list