On Wed, Oct 17, 2012 at 06:49:00PM -0300, Paulo Zanoni wrote:
> Hi
>
> 2012/10/11 Daniel Vetter <daniel.vetter at ffwll.ch>:
> > 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 <daniel.vetter at ffwll.ch>
> > ---
> > 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).
OCD is satisfied, patches merged, thanks for the review.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
