瀏覽代碼

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>
Kristian Høgsberg 15 年之前
父節點
當前提交
69341a5e01
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/gpu/drm/i915/intel_display.c

+ 2 - 2
drivers/gpu/drm/i915/intel_display.c

@@ -4584,8 +4584,6 @@ void intel_modeset_cleanup(struct drm_device *dev)
 	intel_increase_renderclock(dev, false);
 	intel_increase_renderclock(dev, false);
 	del_timer_sync(&dev_priv->idle_timer);
 	del_timer_sync(&dev_priv->idle_timer);
 
 
-	mutex_unlock(&dev->struct_mutex);
-
 	if (dev_priv->display.disable_fbc)
 	if (dev_priv->display.disable_fbc)
 		dev_priv->display.disable_fbc(dev);
 		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);
 		drm_gem_object_unreference(dev_priv->pwrctx);
 	}
 	}
 
 
+	mutex_unlock(&dev->struct_mutex);
+
 	drm_mode_config_cleanup(dev);
 	drm_mode_config_cleanup(dev);
 }
 }