[PATCH] FDO bug

[Madhumitha Tolakanahalli Pradeep]

Signed-off-by: Madhumitha Tolakanahalli Pradeep <madhumitha.tolakanahalli.pradeep at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index e25b82d07d4f..ded9ebae5364 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -17091,6 +17091,12 @@ 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));
 
 	/*
@@ -17113,8 +17119,6 @@ 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);
 
@@ -17124,7 +17128,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