[PATCH] FDO Bug Revert
Madhumitha Tolakanahalli Pradeep
madhumitha.tolakanahalli.pradeep at intel.com
Wed Jul 24 18:05:22 UTC 2019
Signed-off-by: Madhumitha Tolakanahalli Pradeep <madhumitha.tolakanahalli.pradeep at intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index ded9ebae5364..e25b82d07d4f 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -17091,12 +17091,6 @@ void intel_modeset_driver_remove(struct drm_device *dev)
flush_workqueue(dev_priv->modeset_wq);
flush_work(&dev_priv->atomic_helper.free_work);
-
- /* flush any delayed tasks or pending work */
- flush_scheduled_work();
-
- destroy_workqueue(dev_priv->modeset_wq);
-
WARN_ON(!llist_empty(&dev_priv->atomic_helper.free_list));
/*
@@ -17119,6 +17113,8 @@ void intel_modeset_driver_remove(struct drm_device *dev)
intel_fbc_global_disable(dev_priv);
+ /* flush any delayed tasks or pending work */
+ flush_scheduled_work();
intel_hdcp_component_fini(dev_priv);
@@ -17128,7 +17124,7 @@ void intel_modeset_driver_remove(struct drm_device *dev)
intel_gmbus_teardown(dev_priv);
-
+ destroy_workqueue(dev_priv->modeset_wq);
intel_fbc_cleanup_cfb(dev_priv);
}
--
2.17.1
More information about the Intel-gfx-trybot
mailing list