Merge tag 'drm-misc-next-fixes-2018-06-15' of... (4216c1b9) · Commits · 戴 / test

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:

Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/1fd8b7d1-e60a-0105-dfb5-d36f99ea0239@linux.intel.com

drivers/gpu/drm/drm_drv.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -369,13 +369,6 @@ EXPORT_SYMBOL(drm_dev_exit);
		*/
		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
		* the new value of ->unplugged, and any critical section which might
		@@ -384,6 +377,13 @@ void drm_dev_unplug(struct drm_device *dev)
		*/
		dev->unplugged = true;
		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);

Admin message