On Wed, Jul 04, 2012 at 05:07:39PM -0300, Paulo Zanoni wrote: > 2012/6/28 Eugeni Dodonov <eugeni.dodonov at intel.com>: > > 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 at intel.com> > > I couldn't make suspend/resume work on my machine yet, but running > intel_prepare_ddi again after resume won't hurt us, so: > > Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com> Queued for -next, thanks for the patch. Quick aside: I think we have a similar issue with the hsw power well init code. -Daniel > > > --- > > drivers/gpu/drm/i915/intel_display.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 28bee8a..76508a7 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -7179,6 +7179,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); > > @@ -7208,8 +7210,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)) { > > -- > > 1.7.11.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx at lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > -- > Paulo Zanoni > _______________________________________________ > Intel-gfx mailing list > Intel-gfx at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel at ffwll.ch Mobile: +41 (0)79 365 57 48