svn commit: r269064 - in stable/10/sys/dev: drm2/i915 vt

[Ed Maste]

Author: emaste
Date: Thu Jul 24 15:18:19 2014
New Revision: 269064
URL: http://svnweb.freebsd.org/changeset/base/269064

Log:
  MFC r268947: Hide syscons-specific workaround under DEV_SC

Modified:
  stable/10/sys/dev/drm2/i915/intel_fb.c
  stable/10/sys/dev/vt/vt_core.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/drm2/i915/intel_fb.c
==============================================================================
--- stable/10/sys/dev/drm2/i915/intel_fb.c	Thu Jul 24 15:16:03 2014	(r269063)
+++ stable/10/sys/dev/drm2/i915/intel_fb.c	Thu Jul 24 15:18:19 2014	(r269064)
@@ -27,6 +27,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_syscons.h"
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/drm.h>
 #include <dev/drm2/drm_crtc.h>
@@ -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: stable/10/sys/dev/vt/vt_core.c
==============================================================================
--- stable/10/sys/dev/vt/vt_core.c	Thu Jul 24 15:16:03 2014	(r269063)
+++ stable/10/sys/dev/vt/vt_core.c	Thu Jul 24 15:18:19 2014	(r269064)
@@ -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");