diff options
| author | Ville Syrjälä | 2014-08-18 21:16:02 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-09-03 11:04:07 +0200 |
| commit | 15e899a01b5a50d12c96f696a43d4bd5a1ece8be (patch) | |
| tree | 086193d643add46f6ba7537810ad7e0ef6244aec /drivers/gpu/drm/i915/intel_dp.c | |
| parent | drm/i915: Replace big nested if block with early return (diff) | |
| download | kernel-qcow2-linux-15e899a01b5a50d12c96f696a43d4bd5a1ece8be.tar.gz kernel-qcow2-linux-15e899a01b5a50d12c96f696a43d4bd5a1ece8be.tar.xz kernel-qcow2-linux-15e899a01b5a50d12c96f696a43d4bd5a1ece8be.zip | |
drm/i915: Warn about want_panel_vdd in edp_panel_vdd_off_sync()
If we force vdd off warn if someone is still using it. With this
change the delayed vdd off work needs to check want_panel_vdd
itself to make sure it doesn't try to turn vdd off when someone
is using it.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 7e4baa8449c5..17389d0273a5 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1241,7 +1241,9 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); - if (intel_dp->want_panel_vdd || !edp_have_panel_vdd(intel_dp)) + WARN_ON(intel_dp->want_panel_vdd); + + if (!edp_have_panel_vdd(intel_dp)) return; DRM_DEBUG_KMS("Turning eDP VDD off\n"); @@ -1273,7 +1275,8 @@ static void edp_panel_vdd_work(struct work_struct *__work) struct drm_device *dev = intel_dp_to_dev(intel_dp); drm_modeset_lock(&dev->mode_config.connection_mutex, NULL); - edp_panel_vdd_off_sync(intel_dp); + if (!intel_dp->want_panel_vdd) + edp_panel_vdd_off_sync(intel_dp); drm_modeset_unlock(&dev->mode_config.connection_mutex); } |