From owner-svn-src-user@FreeBSD.ORG  Sun Nov 17 00:49:55 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C5B28CF1;
 Sun, 17 Nov 2013 00:49:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B523A2E00;
 Sun, 17 Nov 2013 00:49:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAH0ntjT044929;
 Sun, 17 Nov 2013 00:49:55 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAH0ntDx044928;
 Sun, 17 Nov 2013 00:49:55 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201311170049.rAH0ntDx044928@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Sun, 17 Nov 2013 00:49:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258241 - user/ed/newcons/sys/dev/drm2
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Nov 2013 00:49:55 -0000

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;
 	}