[PATCH 1/6] drm/i915: don't restore LVDS enable state blindly

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 15 Feb 2013 22:10:39 +0100
Daniel Vetter <daniel at 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 at 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


[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux