From: Kristian Høgsberg Date: Wed, 11 Nov 2009 17:19:17 +0000 (-0500) Subject: drm/i915: Hold struct_mutex while unreffing pwrctx object X-Git-Tag: v2.6.33-rc1~323^2~5^2~27 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=69341a5e01897714f968b7dccb94f57137acf45f;p=~shefty%2Frdma-dev.git 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 Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b6251cdd4eb..abd24e2a493 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); }