diff options
author | Eugeni Dodonov <eugeni.dodonov@intel.com> | 2012-06-28 14:55:35 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-05 03:56:06 -0400 |
commit | a8f78b582236a7e518ebcad8161b5599d3c92f5b (patch) | |
tree | 9244a6ca8620624a8c6ab6a9aa799edb4bccbe52 /drivers/gpu/drm/i915 | |
parent | 40579abed0624ce1dd0e54da312566dcc5f0622a (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
7169 | 7169 | ||
7170 | void intel_modeset_init_hw(struct drm_device *dev) | 7170 | void intel_modeset_init_hw(struct drm_device *dev) |
7171 | { | 7171 | { |
7172 | intel_prepare_ddi(dev); | ||
7173 | |||
7172 | intel_init_clock_gating(dev); | 7174 | intel_init_clock_gating(dev); |
7173 | 7175 | ||
7174 | mutex_lock(&dev->struct_mutex); | 7176 | mutex_lock(&dev->struct_mutex); |
@@ -7198,8 +7200,6 @@ void intel_modeset_init(struct drm_device *dev) | |||
7198 | 7200 | ||
7199 | intel_init_pm(dev); | 7201 | intel_init_pm(dev); |
7200 | 7202 | ||
7201 | intel_prepare_ddi(dev); | ||
7202 | |||
7203 | intel_init_display(dev); | 7203 | intel_init_display(dev); |
7204 | 7204 | ||
7205 | if (IS_GEN2(dev)) { | 7205 | if (IS_GEN2(dev)) { |