From owner-svn-src-user@FreeBSD.ORG  Tue Oct 15 13:07:25 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 ESMTP id 831DC6C5;
 Tue, 15 Oct 2013 13:07:25 +0000 (UTC) (envelope-from ray@FreeBSD.org)
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 715AA2148;
 Tue, 15 Oct 2013 13:07:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FD7PG0011150;
 Tue, 15 Oct 2013 13:07:25 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FD7PnB011149;
 Tue, 15 Oct 2013 13:07:25 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201310151307.r9FD7PnB011149@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Tue, 15 Oct 2013 13:07:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r256534 - 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.14
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: Tue, 15 Oct 2013 13:07:25 -0000

Author: ray
Date: Tue Oct 15 13:07:24 2013
New Revision: 256534
URL: http://svnweb.freebsd.org/changeset/base/256534

Log:
  Partially revert accidentally committed #if from r256528.
  
  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	Tue Oct 15 12:59:40 2013	(r256533)
+++ user/ed/newcons/sys/dev/drm2/drm_fb_helper.c	Tue Oct 15 13:07:24 2013	(r256534)
@@ -53,9 +53,7 @@ static vd_init_t	vt_kms_init;
 static vd_blank_t	vt_kms_blank;
 static vd_bitbltchr_t	vt_kms_bitbltchr;
 static vd_postswitch_t	vt_kms_postswitch;
-#if 0
 static void vt_restore_fbdev_mode(void *, int);
-#endif
 
 static struct vt_driver vt_vt_kms_driver = {
 	.vd_init = vt_kms_init,
@@ -167,14 +165,11 @@ vt_kms_init(struct vt_device *vd)
 	/* Clear the screen. */
 	vt_kms_blank(vd, TC_BLACK);
 
-#if 0
 	TASK_INIT(&sc->fb_mode_task, 0, vt_restore_fbdev_mode, vd);
-#endif
 
 	return (CN_INTERNAL);
 }
 
-#if 0
 /* Call restore out of vt(9) locks. */
 static void
 vt_restore_fbdev_mode(void *arg, int pending)
@@ -186,7 +181,6 @@ vt_restore_fbdev_mode(void *arg, int pen
 	sc = vd->vd_softc;
 	drm_fb_helper_restore_fbdev_mode(sc->fb_helper);
 }
-#endif
 
 static void
 vt_kms_postswitch(struct vt_device *vd)
@@ -194,11 +188,7 @@ vt_kms_postswitch(struct vt_device *vd)
 	struct vt_kms_softc *sc;
 
 	sc = vd->vd_softc;
-#if 0
 	taskqueue_enqueue_fast(taskqueue_thread, &sc->fb_mode_task);
-#else
-	drm_fb_helper_restore_fbdev_mode(sc->fb_helper);
-#endif
 }
 
 static DRM_LIST_HEAD(kernel_fb_helper_list);