summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_lvds.c
diff options
context:
space:
mode:
authorDaniel Vetter2012-12-02 01:05:46 +0100
committerDaniel Vetter2013-01-20 22:16:47 +0100
commita0e99e68c12ac6dc5d6b1da7942b5e05d5f848af (patch)
tree13ffff3db0093be6878887ceebfbd0fafc2dc5d6 /drivers/gpu/drm/i915/intel_lvds.c
parentdrm: add drm_modeset_lock|unlock_all (diff)
downloadkernel-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_lvds.c')
-rw-r--r--drivers/gpu/drm/i915/intel_lvds.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 17aee74258ad..279e9d734ece 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -531,9 +531,9 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
dev_priv->modeset_on_lid = 0;
- mutex_lock(&dev->mode_config.mutex);
+ drm_modeset_lock_all(dev);
intel_modeset_setup_hw_state(dev, true);
- mutex_unlock(&dev->mode_config.mutex);
+ drm_modeset_unlock_all(dev);
return NOTIFY_OK;
}