diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-01-14 12:44:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-01-14 12:44:48 +1000 |
| commit | c0eeb856e96982874ebd61b3af88b493d3f665cd (patch) | |
| tree | d87854e4cf433ca1be61178ce5d703c37e4d8f2c /drivers/gpu/drm/i915/intel_display.c | |
| parent | 7e22e91102c6b9df7c4ae2168910e19d2bb14cd6 (diff) | |
| parent | 09f2344d0896eb458a639b922224c7a202c11599 (diff) | |
| download | linux-stable-c0eeb856e96982874ebd61b3af88b493d3f665cd.tar.gz linux-stable-c0eeb856e96982874ebd61b3af88b493d3f665cd.tar.bz2 linux-stable-c0eeb856e96982874ebd61b3af88b493d3f665cd.zip | |
Merge tag 'drm-intel-fixes-2014-01-13' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Black screen fixes, one for hsw+bdw each and a regression fix for
locking+load detection.
* tag 'drm-intel-fixes-2014-01-13' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915/bdw: make sure south port interrupts are enabled properly v2
drm/i915: Don't grab crtc mutexes in intel_modeset_gem_init()
drm/i915: fix DDI PLLs HW state readout code
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 769b864465a9..2bde35d34eb9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11053,10 +11053,10 @@ void intel_modeset_gem_init(struct drm_device *dev) intel_setup_overlay(dev); - drm_modeset_lock_all(dev); + mutex_lock(&dev->mode_config.mutex); drm_mode_config_reset(dev); 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) |