diff options
| author | Daniel Vetter | 2012-12-02 01:05:46 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2013-01-20 22:16:47 +0100 |
| commit | a0e99e68c12ac6dc5d6b1da7942b5e05d5f848af (patch) | |
| tree | 13ffff3db0093be6878887ceebfbd0fafc2dc5d6 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | drm: add drm_modeset_lock|unlock_all (diff) | |
| download | kernel-qcow2-linux-a0e99e68c12ac6dc5d6b1da7942b5e05d5f848af.tar.gz kernel-qcow2-linux-a0e99e68c12ac6dc5d6b1da7942b5e05d5f848af.tar.xz kernel-qcow2-linux-a0e99e68c12ac6dc5d6b1da7942b5e05d5f848af.zip | |
drm/i915: use drm_modeset_lock_all
Two exceptions:
- debugfs files only read information which is not related to crtc, so
can stay on the modeset_config lock.
- Same holds for the edp vdd work in intel_dp.c. Add a corresponding
WARN_ON and a comment next to the intel_dp struct fields for
documentation.
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 | 2 |
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 1b63d55318a0..6912d29f46f3 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1057,6 +1057,8 @@ static void ironlake_panel_vdd_off_sync(struct intel_dp *intel_dp) struct drm_i915_private *dev_priv = dev->dev_private; u32 pp; + WARN_ON(!mutex_is_locked(&dev->mode_config.mutex)); + if (!intel_dp->want_panel_vdd && ironlake_edp_have_panel_vdd(intel_dp)) { pp = ironlake_get_pp_control(dev_priv); pp &= ~EDP_FORCE_VDD; |