From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/6] drm/i915: don't restore LVDS enable state blindly Date: Fri, 15 Feb 2013 22:10:39 +0100 Message-ID: <20130215211039.GH5813@phenom.ffwll.local> References: <1360960957-6688-1-git-send-email-jbarnes@virtuousgeek.org> <1360960957-6688-2-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 12496E5FD8 for ; Fri, 15 Feb 2013 13:08:22 -0800 (PST) Received: by mail-ee0-f54.google.com with SMTP id c41so1919026eek.27 for ; Fri, 15 Feb 2013 13:08:22 -0800 (PST) Content-Disposition: inline In-Reply-To: <1360960957-6688-2-git-send-email-jbarnes@virtuousgeek.org> 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: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Feb 15, 2013 at 12:42:32PM -0800, Jesse Barnes wrote: > We still rely on a few LVDS bits, but restoring the enable bit can cause > trouble at this point, so don't. > > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/i915_suspend.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c > index 2135f21..a81abed 100644 > --- a/drivers/gpu/drm/i915/i915_suspend.c > +++ b/drivers/gpu/drm/i915/i915_suspend.c > @@ -268,9 +268,9 @@ static void i915_restore_display(struct drm_device *dev) > I915_WRITE(BLC_PWM_CTL2, dev_priv->regfile.saveBLC_PWM_CTL2); > > if (HAS_PCH_SPLIT(dev)) { > - I915_WRITE(PCH_LVDS, dev_priv->regfile.saveLVDS); > + I915_WRITE(PCH_LVDS, dev_priv->regfile.saveLVDS & 0x7fffffff); ~LVDS_PORT_EN and I think you need to make this conditional on kms. -Daniel > } else if (IS_MOBILE(dev) && !IS_I830(dev)) > - I915_WRITE(LVDS, dev_priv->regfile.saveLVDS); > + I915_WRITE(LVDS, dev_priv->regfile.saveLVDS & 0x7fffffff); > > if (!IS_I830(dev) && !IS_845G(dev) && !HAS_PCH_SPLIT(dev)) > I915_WRITE(PFIT_CONTROL, dev_priv->regfile.savePFIT_CONTROL); > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch