diff options
| author | Mark Kettenis <kettenis@openbsd.org> | 2013-02-23 19:53:33 +0100 |
|---|---|---|
| committer | Mark Kettenis <kettenis@openbsd.org> | 2013-02-23 19:53:33 +0100 |
| commit | f404d0b6591d094d1d8f6e6ff60d23aaf056e3ee (patch) | |
| tree | ee029af2c2336e6ae005266ce2a1998c2bf2e9bd /sys/dev/wscons | |
| parent | 4f2ac1d2e3ba4328d2975ae447539afe0fc35e88 (diff) | |
Run common vga attachment code after drm attached instead of before.
Let wsdisplay ignore the console indicator if a wsdisplay console has already
been attached.
Diffstat (limited to 'sys/dev/wscons')
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index d957afffa12..43e25fc10bd 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -666,6 +666,10 @@ wsdisplay_common_attach(struct wsdisplay_softc *sc, int console, int kbdmux, #if NWSMUX > 0 struct wsmux_softc *mux; + /* XXX */ + if (wsdisplay_console_device) + console = 0; + if (kbdmux >= 0) mux = wsmux_getmux(kbdmux); else |