diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2009-11-11 12:19:17 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-11-30 16:27:07 -0800 |
| commit | 69341a5e01897714f968b7dccb94f57137acf45f (patch) | |
| tree | 03700d38756c254cf87e17d789606e9571f549ff /drivers/gpu/drm/i915 | |
| parent | 33db679b4ee94e5a55abb439a87905d76739095a (diff) | |
| download | blackbird-op-linux-69341a5e01897714f968b7dccb94f57137acf45f.tar.gz blackbird-op-linux-69341a5e01897714f968b7dccb94f57137acf45f.zip | |
drm/i915: Hold struct_mutex while unreffing pwrctx object
This also extends the mutex to cover fbc disabling, which is safe.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -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 b6251cdd4ebf..abd24e2a4932 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4584,8 +4584,6 @@ void intel_modeset_cleanup(struct drm_device *dev) intel_increase_renderclock(dev, false); del_timer_sync(&dev_priv->idle_timer); - mutex_unlock(&dev->struct_mutex); - if (dev_priv->display.disable_fbc) dev_priv->display.disable_fbc(dev); @@ -4594,6 +4592,8 @@ void intel_modeset_cleanup(struct drm_device *dev) drm_gem_object_unreference(dev_priv->pwrctx); } + mutex_unlock(&dev->struct_mutex); + drm_mode_config_cleanup(dev); } |
