| Message ID | 1393890164-7270-1-git-send-email-patrik.r.jakobsson@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Mar 04, 2014 at 12:42:44AM +0100, Patrik Jakobsson wrote: > 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 dff392dbd258381a6c3164f38420593f2d291e3b > 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: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> This brings the code into line with the comments, and has the bonus of working on a fiddly panel, so Acked-by: Chris Wilson <chris@chris-wilson.co.uk> I don't feel confident enough with the DP sequencing to say why it has to be so though. -Chris
On Tue, Mar 04, 2014 at 08:17:36AM +0000, Chris Wilson wrote: > On Tue, Mar 04, 2014 at 12:42:44AM +0100, Patrik Jakobsson wrote: > > 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 dff392dbd258381a6c3164f38420593f2d291e3b > > 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: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> > > This brings the code into line with the comments, and has the bonus of > working on a fiddly panel, so > > Acked-by: Chris Wilson <chris@chris-wilson.co.uk> > > I don't feel confident enough with the DP sequencing to say why it has > to be so though. Regression fixes win, we can figure this out later again. Queued for -next, thanks for the patch. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 57552eb..6da1fcb 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1252,7 +1252,8 @@ 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 | PANEL_POWER_RESET | EDP_FORCE_VDD | + EDP_BLC_ENABLE); pp_ctrl_reg = _pp_ctrl_reg(intel_dp); @@ -1784,9 +1785,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. */ + 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); + ironlake_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)))
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 dff392dbd258381a6c3164f38420593f2d291e3b 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: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> --- drivers/gpu/drm/i915/intel_dp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)