[Intel-gfx] [PATCH] drm/i915: Don't just say it, actually force edp vdd

[Chris Wilson]

On Sun, Mar 02, 2014 at 01:05:06AM +0100, Patrik Jakobsson wrote:
> This solves the blank screen problem on the MacBook Air 6,2. The
> comments state that we need to force edp vdd so lets put it back. The
> EDP_FORCE_VDD bit was removed in commit:
> 
> commit dff392dbd258381a6c3164f38420593f2d291e3b
> drm/i915: don't touch the VDD when disabling the panel
>     
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74628
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson at gmail.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 57552eb..44de6f7 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1252,7 +1252,7 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp)
>  	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);

I'd feel more comfortable with;

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 46d065b..876184f 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1872,9 +1872,11 @@ 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. */
+       edp_panel_vdd_on(intel_dp);
        intel_edp_backlight_off(intel_dp);
        intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
        intel_edp_panel_off(intel_dp);
+       edp_panel_vdd_off(intel_dp, true);
 
        /* cpu edp my only be disable _after_ the cpu pipe/plane is disabled. */
        if (!(port == PORT_A || IS_VALLEYVIEW(dev)))

Or that vdd_off may have to be post-disable.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre