aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-09-28 19:44:14 -0400
committerKeith Packard <keithp@keithp.com>2011-10-05 22:56:52 -0400
commitf58ff8549ec0dba61aa7f2510559bce814507316 (patch)
treeb869a9191a12f8afc258992e1fe2db349729e2d4 /drivers
parent0b5c541b93792ddd7fe34a450c76377ffad7bef3 (diff)
drm/i915: Ensure eDP powered up during DP_SET_POWER operation in dp_prepare
Any call to intel_dp_sink_dpms must ensure that the panel has power so that the DP_SET_POWER operation will be correctly received. The only one missing this was in intel_dp_prepare. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 2b4acfda21cc..a178414d5d67 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1039,7 +1039,9 @@ static void intel_dp_prepare(struct drm_encoder *encoder)
1039 struct drm_device *dev = encoder->dev; 1039 struct drm_device *dev = encoder->dev;
1040 1040
1041 /* Wake up the sink first */ 1041 /* Wake up the sink first */
1042 ironlake_edp_panel_vdd_on(intel_dp);
1042 intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON); 1043 intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
1044 ironlake_edp_panel_vdd_off(intel_dp);
1043 1045
1044 if (is_edp(intel_dp)) { 1046 if (is_edp(intel_dp)) {
1045 ironlake_edp_backlight_off(dev); 1047 ironlake_edp_backlight_off(dev);