From owner-svn-src-all@FreeBSD.ORG Mon Jul 21 16:38:06 2014 Return-Path: Delivered-To: svn-src-all@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 C0C46A46; Mon, 21 Jul 2014 16:38:06 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 944312930; Mon, 21 Jul 2014 16:38:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6LGc6bw016505; Mon, 21 Jul 2014 16:38:06 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6LGc6Zn016503; Mon, 21 Jul 2014 16:38:06 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201407211638.s6LGc6Zn016503@svn.freebsd.org> From: Ed Maste Date: Mon, 21 Jul 2014 16:38:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268947 - in head/sys/dev: drm2/i915 vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jul 2014 16:38:06 -0000 Author: emaste Date: Mon Jul 21 16:38:05 2014 New Revision: 268947 URL: http://svnweb.freebsd.org/changeset/base/268947 Log: Hide syscons-specific workaround under DEV_SC This change is a bit ugly, but so is the coupling between the i915 driver and syscons. It isn't worth developing a more elegant solution only to support the legacy syscons console. Modified: head/sys/dev/drm2/i915/intel_fb.c head/sys/dev/vt/vt_core.c Modified: head/sys/dev/drm2/i915/intel_fb.c ============================================================================== --- head/sys/dev/drm2/i915/intel_fb.c Mon Jul 21 16:21:17 2014 (r268946) +++ head/sys/dev/drm2/i915/intel_fb.c Mon Jul 21 16:38:05 2014 (r268947) @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_syscons.h" #include #include #include @@ -216,7 +217,9 @@ static void intel_fbdev_destroy(struct d } } +#ifdef DEV_SC extern int sc_txtmouse_no_retrace_wait; +#endif int intel_fbdev_init(struct drm_device *dev) { @@ -240,7 +243,9 @@ int intel_fbdev_init(struct drm_device * drm_fb_helper_single_add_all_connectors(&ifbdev->helper); drm_fb_helper_initial_config(&ifbdev->helper, 32); +#ifdef DEV_SC sc_txtmouse_no_retrace_wait = 1; +#endif return 0; } Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Mon Jul 21 16:21:17 2014 (r268946) +++ head/sys/dev/vt/vt_core.c Mon Jul 21 16:38:05 2014 (r268947) @@ -111,9 +111,6 @@ const struct terminal_class vt_termclass #define VT_UNIT(vw) ((vw)->vw_device->vd_unit * VT_MAXWINDOWS + \ (vw)->vw_number) -/* XXX while syscons is here. */ -int sc_txtmouse_no_retrace_wait; - static SYSCTL_NODE(_kern, OID_AUTO, vt, CTLFLAG_RD, 0, "vt(9) parameters"); VT_SYSCTL_INT(enable_altgr, 1, "Enable AltGr key (Do not assume R.Alt as Alt)"); VT_SYSCTL_INT(debug, 0, "vt(9) debug level");