[Intel-gfx] [PATCH 3/6] drm/i915: don't save/restor ADPA for kms

[Paulo Zanoni]

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).

Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

>         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 at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Paulo Zanoni