From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH 1/6] drm/i915: don't restore LVDS enable
 state blindly
Date: Fri, 15 Feb 2013 13:15:10 -0800
Message-ID: <20130215131510.5c32a290@jbarnes-desktop>
References: <1360960957-6688-1-git-send-email-jbarnes@virtuousgeek.org>
	<1360960957-6688-2-git-send-email-jbarnes@virtuousgeek.org>
	<20130215211039.GH5813@phenom.ffwll.local>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from oproxy13-pub.unifiedlayer.com (oproxy13-pub.unifiedlayer.com
	[69.89.16.30])
	by gabe.freedesktop.org (Postfix) with SMTP id 54537E5ED6
	for <intel-gfx@lists.freedesktop.org>;
	Fri, 15 Feb 2013 13:14:34 -0800 (PST)
In-Reply-To: <20130215211039.GH5813@phenom.ffwll.local>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=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 <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Fri, 15 Feb 2013 22:10:39 +0100
Daniel Vetter <daniel@ffwll.ch> wrote:

> 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 <jbarnes@virtuousgeek.org>
> > ---
> >  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

Good call, will respin.

-- 
Jesse Barnes, Intel Open Source Technology Center