From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: Re: [PATCH 3/6] drm/i915: don't save/restor ADPA for kms Date: Wed, 17 Oct 2012 18:49:00 -0300 Message-ID: References: <1349978908-7687-1-git-send-email-daniel.vetter@ffwll.ch> <1349978908-7687-4-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ie0-f177.google.com (mail-ie0-f177.google.com [209.85.223.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F6E89E81A for ; Wed, 17 Oct 2012 14:49:01 -0700 (PDT) Received: by mail-ie0-f177.google.com with SMTP id e14so13521451iej.36 for ; Wed, 17 Oct 2012 14:49:00 -0700 (PDT) In-Reply-To: <1349978908-7687-4-git-send-email-daniel.vetter@ffwll.ch> 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: Daniel Vetter Cc: Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org Hi 2012/10/11 Daniel Vetter : > We now no longer rely on this. > > This is step 1 on a long journey to rid us of the save/restore > madness, which tends to lightly paper over many issues, and cause > tons of bad things itself ... > > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/i915_suspend.c | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c > index 4776ccf..6e398a8 100644 > --- a/drivers/gpu/drm/i915/i915_suspend.c > +++ b/drivers/gpu/drm/i915/i915_suspend.c > @@ -395,6 +395,13 @@ static void i915_save_modeset_reg(struct drm_device *dev) > break; > } > > + /* CRT state */ > + if (HAS_PCH_SPLIT(dev)) { > + dev_priv->saveADPA = I915_READ(PCH_ADPA); > + } else { > + dev_priv->saveADPA = I915_READ(ADPA); > + } > + My OCD is telling me to ask you to remove '}' and '{' here (yes, I know, they're here because of copy/paste). Reviewed-by: Paulo Zanoni > return; > } > > @@ -601,6 +608,12 @@ static void i915_restore_modeset_reg(struct drm_device *dev) > if (IS_GEN2(dev)) > I915_WRITE(CURSIZE, dev_priv->saveCURSIZE); > > + /* CRT state */ > + if (HAS_PCH_SPLIT(dev)) > + I915_WRITE(PCH_ADPA, dev_priv->saveADPA); > + else > + I915_WRITE(ADPA, dev_priv->saveADPA); > + > return; > } > > @@ -615,13 +628,6 @@ static void i915_save_display(struct drm_device *dev) > /* Don't save them in KMS mode */ > i915_save_modeset_reg(dev); > > - /* CRT state */ > - if (HAS_PCH_SPLIT(dev)) { > - dev_priv->saveADPA = I915_READ(PCH_ADPA); > - } else { > - dev_priv->saveADPA = I915_READ(ADPA); > - } > - > /* LVDS state */ > if (HAS_PCH_SPLIT(dev)) { > dev_priv->savePP_CONTROL = I915_READ(PCH_PP_CONTROL); > @@ -719,12 +725,6 @@ static void i915_restore_display(struct drm_device *dev) > /* Don't restore them in KMS mode */ > i915_restore_modeset_reg(dev); > > - /* CRT state */ > - if (HAS_PCH_SPLIT(dev)) > - I915_WRITE(PCH_ADPA, dev_priv->saveADPA); > - else > - I915_WRITE(ADPA, dev_priv->saveADPA); > - > /* LVDS state */ > if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev)) > I915_WRITE(BLC_PWM_CTL2, dev_priv->saveBLC_PWM_CTL2); > -- > 1.7.11.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni