From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 07/21] drm/i915: re-initialize DDI buffer translations after resume Date: Wed, 4 Jul 2012 22:35:06 +0200 Message-ID: <20120704203506.GG5375@phenom.ffwll.local> References: <1340909749-15249-1-git-send-email-eugeni.dodonov@intel.com> <1340909749-15249-8-git-send-email-eugeni.dodonov@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E0B79E7C2 for ; Wed, 4 Jul 2012 13:35:11 -0700 (PDT) Received: by werb13 with SMTP id b13so2872011wer.36 for ; Wed, 04 Jul 2012 13:35:10 -0700 (PDT) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Paulo Zanoni Cc: intel-gfx@lists.freedesktop.org, Eugeni Dodonov List-Id: intel-gfx@lists.freedesktop.org On Wed, Jul 04, 2012 at 05:07:39PM -0300, Paulo Zanoni wrote: > 2012/6/28 Eugeni Dodonov : > > 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 > > 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 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@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > -- > Paulo Zanoni > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48