Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3064154 authored by Patrik Jakobsson's avatar Patrik Jakobsson Committed by Daniel Vetter
Browse files

drm/i915: Don't just say it, actually force edp vdd 

This patch fixes the blank screen bug introduced in 3.14-rc1 on the
MacBook Air 6,2. The comments state that we need to force edp vdd so
lets put it back.

The regression was introduced by the following commit:

commit dff392db
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date:   Fri Dec 6 17:32:41 2013 -0200

    drm/i915: don't touch the VDD when disabling the panel

v2: Wrap intel_disable_dp() with _vdd_on and _vdd_off

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74628


Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d615a166

drivers/gpu/drm/i915/intel_dp.c

+4 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,8 @@ void intel_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 | PANEL_POWER_RESET | EDP_FORCE_VDD |

		EDP_BLC_ENABLE);



	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
@@ -1861,9 +1862,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)))