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 <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: 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");
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
