[PATCH 11/11] delay-more-kms

[Chris Wilson]

---
 drivers/gpu/drm/i915/i915_drv.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7deb4d82900c..71b649b578cc 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -841,6 +841,14 @@ static void intel_kms_register(void *data, async_cookie_t cookie)
 	struct resume_context *ctx = data;
 	struct drm_device *dev = ctx->i915->dev;
 
+	spin_lock_irq(&ctx->i915->irq_lock);
+	if (ctx->i915->display.hpd_irq_setup)
+		ctx->i915->display.hpd_irq_setup(ctx->i915);
+	spin_unlock_irq(&ctx->i915->irq_lock);
+
+	intel_dp_mst_resume(dev);
+	intel_display_resume(dev);
+
 	/*
 	 * ... but also need to make sure that hotplug processing
 	 * doesn't cause havoc. Like in the driver load code we don't
@@ -880,15 +888,6 @@ static void intel_kms_resume(void *data, async_cookie_t cookie)
 
 	intel_modeset_init_hw(dev);
 
-	spin_lock_irq(&ctx->i915->irq_lock);
-	if (ctx->i915->display.hpd_irq_setup)
-		ctx->i915->display.hpd_irq_setup(ctx->i915);
-	spin_unlock_irq(&ctx->i915->irq_lock);
-
-	intel_dp_mst_resume(dev);
-
-	intel_display_resume(dev);
-
 	/* And register the outputs without pausing resume */
 	async_schedule_domain(intel_kms_register,
 			      resume_context_get(ctx),
-- 
2.8.1