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>

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 2b4acfda21cc7fe2a8fa2b307926bcb6569e22a4..a178414d5d673b1d3647d5d83a760f25f1b5018c 100644 (file)
--- 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)
        struct drm_device *dev = encoder->dev;
 
        /* Wake up the sink first */
+       ironlake_edp_panel_vdd_on(intel_dp);
        intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
+       ironlake_edp_panel_vdd_off(intel_dp);
 
        if (is_edp(intel_dp)) {
                ironlake_edp_backlight_off(dev);