提交 69341a5e 编写于 作者: K Kristian Høgsberg 提交者: Eric Anholt

drm/i915: Hold struct_mutex while unreffing pwrctx object

This also extends the mutex to cover fbc disabling, which is safe.
Signed-off-by: NKristian Høgsberg <krh@bitplanet.net>
Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: NEric Anholt <eric@anholt.net>
上级 33db679b
...@@ -4584,8 +4584,6 @@ void intel_modeset_cleanup(struct drm_device *dev) ...@@ -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) ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册