提交 4216c1b9 编写于 作者: D Dave Airlie

Merge tag 'drm-misc-next-fixes-2018-06-15' of...

Merge tag 'drm-misc-next-fixes-2018-06-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Single fix for v4.18:
- Fix possible race conditions while unplugging DRM device.
Signed-off-by: NDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1fd8b7d1-e60a-0105-dfb5-d36f99ea0239@linux.intel.com
...@@ -369,13 +369,6 @@ EXPORT_SYMBOL(drm_dev_exit); ...@@ -369,13 +369,6 @@ EXPORT_SYMBOL(drm_dev_exit);
*/ */
void drm_dev_unplug(struct drm_device *dev) void drm_dev_unplug(struct drm_device *dev)
{ {
drm_dev_unregister(dev);
mutex_lock(&drm_global_mutex);
if (dev->open_count == 0)
drm_dev_put(dev);
mutex_unlock(&drm_global_mutex);
/* /*
* After synchronizing any critical read section is guaranteed to see * After synchronizing any critical read section is guaranteed to see
* the new value of ->unplugged, and any critical section which might * the new value of ->unplugged, and any critical section which might
...@@ -384,6 +377,13 @@ void drm_dev_unplug(struct drm_device *dev) ...@@ -384,6 +377,13 @@ void drm_dev_unplug(struct drm_device *dev)
*/ */
dev->unplugged = true; dev->unplugged = true;
synchronize_srcu(&drm_unplug_srcu); synchronize_srcu(&drm_unplug_srcu);
drm_dev_unregister(dev);
mutex_lock(&drm_global_mutex);
if (dev->open_count == 0)
drm_dev_put(dev);
mutex_unlock(&drm_global_mutex);
} }
EXPORT_SYMBOL(drm_dev_unplug); EXPORT_SYMBOL(drm_dev_unplug);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册