diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2007-02-25 18:14:49 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-02-25 18:14:49 +0000 |
| commit | ae150d086358863c66f8c2c2237a5fd71b0a4565 (patch) | |
| tree | 72315c8570b8b3e5cbb8a590ae59820f48687844 /sys | |
| parent | 343d65745ed066e14e640debcbb2d760c297fe1e (diff) | |
Disable acceleration by default; set device flags to a nonzero value to
enable.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/dev/p9000.c | 8 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/p9100.c | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/sys/arch/sparc/dev/p9000.c b/sys/arch/sparc/dev/p9000.c index 5c38a66ef9c..f957fb442e8 100644 --- a/sys/arch/sparc/dev/p9000.c +++ b/sys/arch/sparc/dev/p9000.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p9000.c,v 1.19 2007/02/18 18:40:35 miod Exp $ */ +/* $OpenBSD: p9000.c,v 1.20 2007/02/25 18:14:48 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. @@ -263,7 +263,8 @@ p9000attach(struct device *parent, struct device *self, void *args) /* * Plug-in accelerated console operations. */ - p9000_ras_init(sc); + if (sc->sc_sunfb.sf_dev.dv_cfdata->cf_flags != 0) + p9000_ras_init(sc); /* enable video */ p9000_burner(sc, 1, 0); @@ -300,7 +301,8 @@ p9000_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p) case WSDISPLAYIO_SMODE: /* Restore proper acceleration state upon leaving X11 */ if (*(u_int *)data == WSDISPLAYIO_MODE_EMUL) { - p9000_ras_init(sc); + if (sc->sc_sunfb.sf_dev.dv_cfdata->cf_flags != 0) + p9000_ras_init(sc); } break; diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c index e5247e16863..bddcd124e7c 100644 --- a/sys/arch/sparc/dev/p9100.c +++ b/sys/arch/sparc/dev/p9100.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p9100.c,v 1.43 2007/02/18 18:40:35 miod Exp $ */ +/* $OpenBSD: p9100.c,v 1.44 2007/02/25 18:14:48 miod Exp $ */ /* * Copyright (c) 2003, 2005, 2006, Miodrag Vallat. @@ -408,7 +408,8 @@ p9100attach(struct device *parent, struct device *self, void *args) /* * Plug-in accelerated console operations. */ - p9100_ras_init(sc); + if (sc->sc_sunfb.sf_dev.dv_cfdata->cf_flags != 0) + p9100_ras_init(sc); /* enable video */ p9100_burner(sc, 1, 0); @@ -458,7 +459,8 @@ p9100_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p) #endif fbwscons_setcolormap(&sc->sc_sunfb, p9100_setcolor); /* Restore proper acceleration state as well */ - p9100_ras_init(sc); + if (sc->sc_sunfb.sf_dev.dv_cfdata->cf_flags != 0) + p9100_ras_init(sc); break; } break; @@ -1349,7 +1351,8 @@ p9100_prom(void *v) sc->sc_mapmode != WSDISPLAYIO_MODE_EMUL) { p9100_initialize_ramdac(sc, LCD_WIDTH, 8); fbwscons_setcolormap(&sc->sc_sunfb, p9100_setcolor); - p9100_ras_init(sc); + if (sc->sc_sunfb.sf_dev.dv_cfdata->cf_flags != 0) + p9100_ras_init(sc); } } #endif /* NTCTRL > 0 */ |