]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
drm/i915: re-initialize DDI buffer translations after resume
authorEugeni Dodonov <eugeni.dodonov@intel.com>
Thu, 28 Jun 2012 18:55:35 +0000 (15:55 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 5 Jul 2012 07:56:06 +0000 (09:56 +0200)
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>
drivers/gpu/drm/i915/intel_display.c

index b5ee440cd621b8fd3897ad19469965bb5f31d354..4d84fcdd413f900714a9388472f33616173acdfe 100644 (file)
@@ -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)) {