From c5fa79e8d870298fb5c1319f578f537dc06e2dce Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni.dodonov@intel.com>
Date: Thu, 28 Jun 2012 15:55:35 -0300
Subject: [PATCH] --- yaml --- r: 318655 b: refs/heads/master c:
 a8f78b582236a7e518ebcad8161b5599d3c92f5b h: refs/heads/master i:   318653:
 fd0b8c24251411405008f241fd7d55d899a00e64   318651:
 0ab2b1020fbaf7141dde0d470208b6a29e326f67   318647:
 ce64f1b92c1798f4df4803dbfff931aee2024373   318639:
 8b13eeabd575ca609ab91fee540ecb06b7d490e3   318623:
 4c3c86943d257e05298ebab6f3c4552dea98ed76   318591:
 d85e516b7629620eb5971c266bc8e290c7cedd2c v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4b52f799d696..d8ff97539de2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40579abed0624ce1dd0e54da312566dcc5f0622a
+refs/heads/master: a8f78b582236a7e518ebcad8161b5599d3c92f5b
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index b5ee440cd621..4d84fcdd413f 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -7169,6 +7169,8 @@ static void ivb_pch_pwm_override(struct drm_device *dev)
 
 void intel_modeset_init_hw(struct drm_device *dev)
 {
+	intel_prepare_ddi(dev);
+
 	intel_init_clock_gating(dev);
 
 	mutex_lock(&dev->struct_mutex);
@@ -7198,8 +7200,6 @@ void intel_modeset_init(struct drm_device *dev)
 
 	intel_init_pm(dev);
 
-	intel_prepare_ddi(dev);
-
 	intel_init_display(dev);
 
 	if (IS_GEN2(dev)) {