From: Eugeni Dodonov <eugeni.dodonov@intel.com>
Date: Thu, 28 Jun 2012 18:55:35 +0000 (-0300)
Subject: drm/i915: re-initialize DDI buffer translations after resume
X-Git-Tag: MMI-PSA29.97-13-9~16260^2~39^2~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a8f78b582236a7e518ebcad8161b5599d3c92f5b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drm/i915: re-initialize DDI buffer translations after resume

This is necessary for the modesetting to work correctly after a
suspend-resume cycle. Without this, the pipes and clocks got the correct
configuration, but the underlying DDI buffers configuration was lost.

Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b5ee440cd621..4d84fcdd413f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/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)) {