diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-01 19:05:46 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-01-20 16:16:47 -0500 |
commit | a0e99e68c12ac6dc5d6b1da7942b5e05d5f848af (patch) | |
tree | 13ffff3db0093be6878887ceebfbd0fafc2dc5d6 /drivers/gpu/drm/i915/intel_lvds.c | |
parent | 848499032504b1defdebdcf930aa70bd01a45ac1 (diff) |
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.c | 4 |
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, | |||
531 | 531 | ||
532 | dev_priv->modeset_on_lid = 0; | 532 | dev_priv->modeset_on_lid = 0; |
533 | 533 | ||
534 | mutex_lock(&dev->mode_config.mutex); | 534 | drm_modeset_lock_all(dev); |
535 | intel_modeset_setup_hw_state(dev, true); | 535 | intel_modeset_setup_hw_state(dev, true); |
536 | mutex_unlock(&dev->mode_config.mutex); | 536 | drm_modeset_unlock_all(dev); |
537 | 537 | ||
538 | return NOTIFY_OK; | 538 | return NOTIFY_OK; |
539 | } | 539 | } |