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.
This commit is contained in:
parent
e19f362e28
commit
4a87818e07
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=268947
@ -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 drm_device *dev,
|
||||
}
|
||||
}
|
||||
|
||||
#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 *dev)
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -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");
|
||||
|
Loading…
Reference in New Issue
Block a user