[Intel-gfx] [PATCH for -fixes] Revert "drm/i915: don't touch the VDD when disabling the panel"

[Patrik Jakobsson]

On Mon, Mar 17, 2014 at 3:42 PM, Jani Nikula <jani.nikula at intel.com> wrote:

> This reverts
> commit dff392dbd258381a6c3164f38420593f2d291e3b
> Author: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Date:   Fri Dec 6 17:32:41 2013 -0200
>
>     drm/i915: don't touch the VDD when disabling the panel
>
> which didn't take into account
>
> commit 6cb49835da0426f69a2931bc2a0a8156344b0e41
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date:   Sun May 20 17:14:50 2012 +0200
>
>     drm/i915: enable vdd when switching off the eDP panel
>
> and
>
> commit 35a38556d900b9cb5dfa2529c93944b847f8a8a4
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date:   Sun Aug 12 22:17:14 2012 +0200
>
>     drm/i915: reorder edp disabling to fix ivb MacBook Air
>
> Unsurprisingly, various MacBooks failed.
>
> Effectively the same has already been done in drm-intel-next-queued.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74628
> Cc: Patrik Jakobsson <patrik.r.jakobsson at gmail.com>
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_ddi.c |    1 +
>  drivers/gpu/drm/i915/intel_dp.c  |   10 +++++++++-
>  2 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c
> b/drivers/gpu/drm/i915/intel_ddi.c
> index e06b9e017d6b..234ac5f7bc5a 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1244,6 +1244,7 @@ static void intel_ddi_post_disable(struct
> intel_encoder *intel_encoder)
>         if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) {
>                 struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
>                 intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
> +               ironlake_edp_panel_vdd_on(intel_dp);
>                 ironlake_edp_panel_off(intel_dp);
>         }
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c
> b/drivers/gpu/drm/i915/intel_dp.c
> index 41bdac44dfc1..2688f6d64bb9 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1249,17 +1249,24 @@ void ironlake_edp_panel_off(struct intel_dp
> *intel_dp)
>
>         DRM_DEBUG_KMS("Turn eDP power off\n");
>
> +       WARN(!intel_dp->want_panel_vdd, "Need VDD to turn off panel\n");
> +
>         pp = ironlake_get_pp_control(intel_dp);
>         /* We need to switch off panel power _and_ force vdd, for
> otherwise some
>          * panels get very unhappy and cease to work. */
> -       pp &= ~(POWER_TARGET_ON | PANEL_POWER_RESET | EDP_BLC_ENABLE);
> +       pp &= ~(POWER_TARGET_ON | EDP_FORCE_VDD | PANEL_POWER_RESET |
> EDP_BLC_ENABLE);
>
>         pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
>
>         I915_WRITE(pp_ctrl_reg, pp);
>         POSTING_READ(pp_ctrl_reg);
>
> +       intel_dp->want_panel_vdd = false;
> +
>         ironlake_wait_panel_off(intel_dp);
> +
> +       /* We got a reference when we enabled the VDD. */
> +       intel_runtime_pm_put(dev_priv);
>  }
>
>  void ironlake_edp_backlight_on(struct intel_dp *intel_dp)
> @@ -1784,6 +1791,7 @@ static void intel_disable_dp(struct intel_encoder
> *encoder)
>
>         /* Make sure the panel is off before trying to change the mode.
> But also
>          * ensure that we have vdd while we switch off the panel. */
> +       ironlake_edp_panel_vdd_on(intel_dp);
>         ironlake_edp_backlight_off(intel_dp);
>         intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
>         ironlake_edp_panel_off(intel_dp);
> --
> 1.7.9.5
>
>
This fixes my MacBook Air problem.

Thanks
Patrik
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20140318/47f3c80a/attachment.html>