svn commit: r258241 - user/ed/newcons/sys/dev/drm2

[Aleksandr Rybalko]

Author: ray
Date: Sun Nov 17 00:49:55 2013
New Revision: 258241
URL: http://svnweb.freebsd.org/changeset/base/258241

Log:
  Lock mode_config before call drm_crtc_helper_set_config.
  
  Submitted by:	avg
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/ed/newcons/sys/dev/drm2/drm_fb_helper.c

Modified: user/ed/newcons/sys/dev/drm2/drm_fb_helper.c
==============================================================================
--- user/ed/newcons/sys/dev/drm2/drm_fb_helper.c	Sat Nov 16 23:37:56 2013	(r258240)
+++ user/ed/newcons/sys/dev/drm2/drm_fb_helper.c	Sun Nov 17 00:49:55 2013	(r258241)
@@ -385,7 +385,9 @@ bool drm_fb_helper_restore_fbdev_mode(st
 	int i, ret;
 	for (i = 0; i < fb_helper->crtc_count; i++) {
 		struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;
+		sx_xlock(&fb_helper->dev->mode_config.mutex);
 		ret = drm_crtc_helper_set_config(mode_set);
+		sx_xunlock(&fb_helper->dev->mode_config.mutex);
 		if (ret)
 			error = true;
 	}