summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjason <jason@openbsd.org>2002-07-09 23:33:15 +0000
committerjason <jason@openbsd.org>2002-07-09 23:33:15 +0000
commitf56835ad1179eb23c18b772195777e992a8a826f (patch)
tree0eb8b98e04f34243883748ce7f9b4260e9f7b165
parentFix typo (get_sets_list -> get_sets) that caused ftp installs to fail. (diff)
downloadwireguard-openbsd-f56835ad1179eb23c18b772195777e992a8a826f.tar.xz
wireguard-openbsd-f56835ad1179eb23c18b772195777e992a8a826f.zip
try to disable vsync timing if sparc_vsyncblank is set
-rw-r--r--sys/arch/sparc/dev/bwtwo.c8
-rw-r--r--sys/arch/sparc/dev/cgthree.c10
2 files changed, 13 insertions, 5 deletions
diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c
index 6934d87c980..81cf7720afe 100644
--- a/sys/arch/sparc/dev/bwtwo.c
+++ b/sys/arch/sparc/dev/bwtwo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwtwo.c,v 1.20 2002/03/14 01:26:42 millert Exp $ */
+/* $OpenBSD: bwtwo.c,v 1.21 2002/07/09 23:33:15 jason Exp $ */
/* $NetBSD: bwtwo.c,v 1.33 1997/05/24 20:16:02 pk Exp $ */
/*
@@ -491,6 +491,7 @@ bwtwo_set_video(sc, enable)
struct bwtwo_softc *sc;
int enable;
{
+ extern int sparc_vsyncblank;
#if defined(SUN4)
if (CPU_ISSUN4 && (sc->sc_bustype == BUS_OBIO)) {
@@ -514,6 +515,9 @@ bwtwo_set_video(sc, enable)
if (enable)
sc->sc_reg->fbc_ctrl |= FBC_VENAB | FBC_TIMING;
- else
+ else {
sc->sc_reg->fbc_ctrl &= ~FBC_VENAB;
+ if (sparc_vsyncblank)
+ sc->sc_reg->fbc_ctrl &= ~FBC_TIMING;
+ }
}
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c
index 4b79c751e16..4a079be7265 100644
--- a/sys/arch/sparc/dev/cgthree.c
+++ b/sys/arch/sparc/dev/cgthree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgthree.c,v 1.13 2002/03/14 01:26:42 millert Exp $ */
+/* $OpenBSD: cgthree.c,v 1.14 2002/07/09 23:33:15 jason Exp $ */
/* $NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */
/*
@@ -370,11 +370,15 @@ cgthree_set_video(sc, enable)
struct cgthree_softc *sc;
int enable;
{
+ extern int sparc_vsyncblank;
if (enable)
- sc->sc_fbc->fbc_ctrl |= FBC_VENAB;
- else
+ sc->sc_fbc->fbc_ctrl |= FBC_VENAB | FBC_TIMING;
+ else {
sc->sc_fbc->fbc_ctrl &= ~FBC_VENAB;
+ if (sparc_vsyncblank)
+ sc->sc_fbc->fbc_ctrl &= ~FBC_TIMING;
+ }
}
static int