diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-27 14:57:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-27 14:57:42 +0000 |
| commit | 0f3550b731084e2790caf1d73bfe0e3a454aafae (patch) | |
| tree | 96e387b7ae0da48c3ac13dd5ce922c983bc5debb /drivers/gpu/drm/i915/intel_display.c | |
| parent | b7e46105cae50b29ac0b08e2e3c04b5ca34bc2a5 (diff) | |
| parent | 51ad557e21b8713f3abc286c14bca4ed01b8e56d (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-14.01
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 15358add4f7..54ae96f7bec 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9456,9 +9456,9 @@ void intel_modeset_gem_init(struct drm_device *dev) intel_setup_overlay(dev); - drm_modeset_lock_all(dev); + mutex_lock(&dev->mode_config.mutex); intel_modeset_setup_hw_state(dev, false); - drm_modeset_unlock_all(dev); + mutex_unlock(&dev->mode_config.mutex); } void intel_modeset_cleanup(struct drm_device *dev) |