[PATCH 11/11] pm-suspend

[Chris Wilson]

---
 drivers/gpu/drm/i915/i915_gem_pm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_pm.c b/drivers/gpu/drm/i915/i915_gem_pm.c
index bc0663cac7b6..9fb0e8d567a2 100644
--- a/drivers/gpu/drm/i915/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/i915_gem_pm.c
@@ -239,8 +239,6 @@ void i915_gem_suspend(struct drm_i915_private *i915)
 
 	wakeref = intel_runtime_pm_get(i915);
 
-	flush_workqueue(i915->wq);
-
 	mutex_lock(&i915->drm.struct_mutex);
 
 	/*
@@ -265,6 +263,8 @@ void i915_gem_suspend(struct drm_i915_private *i915)
 	 */
 	drain_delayed_work(&i915->gem.idle_work);
 
+	flush_workqueue(i915->wq);
+
 	/*
 	 * Assert that we successfully flushed all the work and
 	 * reset the GPU back to its idle, low power state.
-- 
2.20.1