diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-04-16 22:43:42 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-17 00:34:54 +0200 |
| commit | 17038de5f16569a25343cf68668f3b657eafb00e (patch) | |
| tree | b64b1564bc559e5404f3d3335da47317c7dfa4c6 /drivers | |
| parent | 8aaa81a166d80ac9bf2813984e5b4c2503d0fe08 (diff) | |
| download | linux-stable-17038de5f16569a25343cf68668f3b657eafb00e.tar.gz linux-stable-17038de5f16569a25343cf68668f3b657eafb00e.tar.bz2 linux-stable-17038de5f16569a25343cf68668f3b657eafb00e.zip | |
drm/i915/dp: Flush any outstanding work to turn the VDD off
As we may kick off a delayed workqueue task to switch of the VDD lines, we
need to complete that task prior to turning off the panel (which itself
depends upon VDD being off).
v2: Don't cancel the outstanding work as this may trigger a deadlock
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Keith Packard <keithp@keithp.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 6346b29ee934..38d097db696f 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1128,6 +1128,7 @@ static void ironlake_edp_panel_off(struct intel_dp *intel_dp) DRM_DEBUG_KMS("Turn eDP power off\n"); WARN(intel_dp->want_panel_vdd, "Cannot turn power off while VDD is on\n"); + ironlake_panel_vdd_off_sync(intel_dp); /* finish any pending work */ pp = ironlake_get_pp_control(dev_priv); pp &= ~(POWER_TARGET_ON | EDP_FORCE_VDD | PANEL_POWER_RESET | EDP_BLC_ENABLE); |