From owner-svn-src-user@FreeBSD.ORG Mon Nov 18 22:35:02 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF0C5BD0; Mon, 18 Nov 2013 22:35:02 +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 CF24B2C07; Mon, 18 Nov 2013 22:35:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIMZ2cw034467; Mon, 18 Nov 2013 22:35:02 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIMZ2qK034466; Mon, 18 Nov 2013 22:35:02 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201311182235.rAIMZ2qK034466@svn.freebsd.org> From: Aleksandr Rybalko Date: Mon, 18 Nov 2013 22:35:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258323 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Nov 2013 22:35:02 -0000 Author: ray Date: Mon Nov 18 22:35:02 2013 New Revision: 258323 URL: http://svnweb.freebsd.org/changeset/base/258323 Log: Move mode_config up one level. DRM drivers call drm_fb_helper_restore_fbdev_mode with that lock already held. Suggested 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 Mon Nov 18 22:18:07 2013 (r258322) +++ user/ed/newcons/sys/dev/drm2/drm_fb_helper.c Mon Nov 18 22:35:02 2013 (r258323) @@ -49,10 +49,14 @@ static void vt_restore_fbdev_mode(void * static void vt_restore_fbdev_mode(void *arg, int pending) { + struct drm_fb_helper *fb_helper; struct vt_kms_softc *sc; sc = (struct vt_kms_softc *)arg; - drm_fb_helper_restore_fbdev_mode(sc->fb_helper); + fb_helper = sc->fb_helper; + sx_xlock(&fb_helper->dev->mode_config.mutex); + drm_fb_helper_restore_fbdev_mode(fb_helper); + sx_xunlock(&fb_helper->dev->mode_config.mutex); } static int @@ -385,9 +389,7 @@ 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; }