diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-03-28 00:23:06 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-03-28 00:23:06 +0000 |
| commit | 3872b99864612c2f5c37b38fa2a9dc4cd5d12b5b (patch) | |
| tree | 8af0f4cbd2279c457e977b3f2992abe548f3212f /sys | |
| parent | 2ead42e3082de6b150fcb73abd0de9107c720102 (diff) | |
If console acceleration was not enabled, do not reinitialize the blitter
when leaving X11.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/sbus/cgsix.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/sbus/cgsix.c b/sys/dev/sbus/cgsix.c index f4f2fb75ad4..a67523d6344 100644 --- a/sys/dev/sbus/cgsix.c +++ b/sys/dev/sbus/cgsix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgsix.c,v 1.36 2003/03/27 18:06:48 jason Exp $ */ +/* $OpenBSD: cgsix.c,v 1.37 2003/03/28 00:23:05 miod Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -348,9 +348,12 @@ cgsix_ioctl(v, cmd, data, flags, p) break; case WSDISPLAYIO_SMODE: mode = *(u_int *)data; - if (sc->sc_mode != WSDISPLAYIO_MODE_EMUL && - mode == WSDISPLAYIO_MODE_EMUL) - cgsix_ras_init(sc); + if ((sc->sc_dev.dv_cfdata->cf_flags & CG6_CFFLAG_NOACCEL) + == 0) { + if (sc->sc_mode != WSDISPLAYIO_MODE_EMUL && + mode == WSDISPLAYIO_MODE_EMUL) + cgsix_ras_init(sc); + } sc->sc_mode = mode; break; case WSDISPLAYIO_GINFO: |