aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKeith Packard2011-09-28 16:28:00 -0700
committerKeith Packard2011-09-30 16:23:46 -0700
commitbee7eb2da2fb50ccf76cb7596d20e90d28de040c (patch)
treed0c442260a91a82045fc603f7a25fb8549678fec /drivers
parent97af61f57e03a39afa309d1c8a0d8fb9331e2f89 (diff)
drm/i915: Turn force VDD back off when panel running in intel_dp_dpms
The VDD force bit is turned on before touching the panel, but if it was enabled, there was no call to turn it back off. Add a call. 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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index f80ff327d873..7e59f060a03b 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1088,7 +1088,8 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)
ironlake_edp_panel_on(intel_dp);
ironlake_edp_panel_vdd_off(intel_dp);
intel_dp_complete_link_train(intel_dp);
- }
+ } else
+ ironlake_edp_panel_vdd_off(intel_dp);
if (is_edp(intel_dp))
ironlake_edp_backlight_on(dev);
}