Do not bother taking care of the frame buffer flags in the softc, if the

driver does not use any. Basically this changes all drivers but those that
can handle a P4 card.

12 files changed, 22 insertions, 80 deletions

diff --git a/sys/arch/sparc/dev/agten.c b/sys/arch/sparc/dev/agten.c
index 5179d897c86..e28c6a1ff50 100644
--- a/sys/arch/sparc/dev/agten.c
+++ b/sys/arch/sparc/dev/agten.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agten.c,v 1.2 2003/03/06 22:17:49 miod Exp $	*/
+/*	$OpenBSD: agten.c,v 1.3 2003/06/06 19:42:47 miod Exp $	*/
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
  * All rights reserved.
@@ -157,15 +157,9 @@ struct cfdriver agten_cd = {
 int
 agtenmatch(struct device *parent, void *vcf, void *aux)
 {
-	struct cfdata *cf = vcf;
 	struct confargs *ca = aux;
 	struct romaux *ra = &ca->ca_ra;
 
-	/*
-	 * Mask out invalid flags from the user.
-	 */
-	cf->cf_flags &= FB_USERMASK;
-
 	if (strcmp(ra->ra_name, "PFU,aga") != 0)
 		return (0);
 
@@ -181,8 +175,6 @@ agtenattach(struct device *parent, struct device *self, void *args)
 	int node, isconsole;
 	char *nam;
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags;
-
 	node = ca->ca_ra.ra_node;
 	nam = getpropstring(node, "model");
 	printf(": model %s", nam);
diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c
index 837d4d787d8..8cc62d38e06 100644
--- a/sys/arch/sparc/dev/cgfourteen.c
+++ b/sys/arch/sparc/dev/cgfourteen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgfourteen.c,v 1.24 2003/04/28 13:19:58 miod Exp $	*/
+/*	$OpenBSD: cgfourteen.c,v 1.25 2003/06/06 19:42:47 miod Exp $	*/
 /*	$NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */
 
 /*
@@ -240,8 +240,6 @@ cgfourteenattach(parent, self, args)
 	int isconsole = 0;
 	char *nam;
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags & FB_USERMASK;
-
 	printf(": ");
 	node = ca->ca_ra.ra_node;
 	nam = getpropstring(node, "model");
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c
index e6c409338aa..30090a0d7a3 100644
--- a/sys/arch/sparc/dev/cgthree.c
+++ b/sys/arch/sparc/dev/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.21 2003/06/02 23:27:54 millert Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.22 2003/06/06 19:42:47 miod Exp $	*/
 /*	$NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */
 
 /*
@@ -198,11 +198,6 @@ cgthreematch(parent, vcf, aux)
 	struct confargs *ca = aux;
 	struct romaux *ra = &ca->ca_ra;
 
-	/*
-	 * Mask out invalid flags from the user.
-	 */
-	cf->cf_flags &= FB_USERMASK;
-
 	if (strcmp(cf->cf_driver->cd_name, ra->ra_name) &&
 	    strcmp("cgRDI", ra->ra_name))
 		return (0);
@@ -230,8 +225,6 @@ cgthreeattach(parent, self, args)
 	int isconsole = 0, sbus = 1;
 	char *nam = NULL;
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags;
-
 	switch (ca->ca_bustype) {
 	case BUS_OBIO:
 		if (CPU_ISSUN4M) {	/* 4m has framebuffer on obio */
diff --git a/sys/arch/sparc/dev/cgtwelve.c b/sys/arch/sparc/dev/cgtwelve.c
index ecf0a6a3153..58932b97b56 100644
--- a/sys/arch/sparc/dev/cgtwelve.c
+++ b/sys/arch/sparc/dev/cgtwelve.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwelve.c,v 1.7 2003/05/12 20:18:39 jason Exp $	*/
+/*	$OpenBSD: cgtwelve.c,v 1.8 2003/06/06 19:42:47 miod Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Miodrag Vallat.  All rights reserved.
@@ -173,7 +173,6 @@ cgtwelveattach(parent, self, args)
 	int isconsole = 0;
 	char *ps;
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags & FB_USERMASK;
 	node = ca->ca_ra.ra_node;
 
 	printf(": %s", getpropstring(node, "model"));
diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c
index a3945e79498..c505384c7d8 100644
--- a/sys/arch/sparc/dev/cgtwo.c
+++ b/sys/arch/sparc/dev/cgtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwo.c,v 1.27 2003/06/02 23:27:54 millert Exp $	*/
+/*	$OpenBSD: cgtwo.c,v 1.28 2003/06/06 19:42:47 miod Exp $	*/
 /*	$NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */
 
 /*
@@ -173,11 +173,6 @@ cgtwomatch(parent, vcf, aux)
 	struct romaux *ra = &ca->ca_ra;
 	caddr_t tmp;
 
-	/*
-	 * Mask out invalid flags from the user.
-	 */
-	cf->cf_flags &= FB_USERMASK;
-
 	if (strcmp(cf->cf_driver->cd_name, ra->ra_name))
 		return (0);
 
@@ -208,8 +203,6 @@ cgtwoattach(parent, self, args)
 	int isconsole = 0;
 	char *nam = NULL;
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags;
-
 	switch (ca->ca_bustype) {
 	case BUS_VME16:
 		node = 0;
diff --git a/sys/arch/sparc/dev/mgx.c b/sys/arch/sparc/dev/mgx.c
index a510f84e2e2..880ffeb23fd 100644
--- a/sys/arch/sparc/dev/mgx.c
+++ b/sys/arch/sparc/dev/mgx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mgx.c,v 1.3 2003/05/18 20:29:16 miod Exp $	*/
+/*	$OpenBSD: mgx.c,v 1.4 2003/06/06 19:42:47 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -168,7 +168,6 @@ mgxattach(struct device *parent, struct device *self, void *args)
 	int node, fbsize;
 	int isconsole;
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags & FB_USERMASK;
 	node = ca->ca_ra.ra_node;
 
 	printf(": %s", getpropstring(node, "model"));
diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c
index a66a3da8ff9..0c1eac65315 100644
--- a/sys/arch/sparc/dev/p9100.c
+++ b/sys/arch/sparc/dev/p9100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9100.c,v 1.16 2003/06/05 22:32:09 miod Exp $	*/
+/*	$OpenBSD: p9100.c,v 1.17 2003/06/06 19:42:47 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -243,15 +243,9 @@ p9100match(parent, vcf, aux)
 	struct device *parent;
 	void *vcf, *aux;
 {
-	struct cfdata *cf = vcf;
 	struct confargs *ca = aux;
 	struct romaux *ra = &ca->ca_ra;
 
-	/*
-	 * Mask out invalid flags from the user.
-	 */
-	cf->cf_flags &= FB_USERMASK;
-
 	if (strcmp("p9100", ra->ra_name))
 		return (0);
 
@@ -280,7 +274,6 @@ p9100attach(parent, self, args)
 	}
 #endif
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags;
 	sc->sc_phys = ca->ca_ra.ra_reg[P9100_REG_VRAM];
 
 	sc->sc_ctl = mapiodev(&(ca->ca_ra.ra_reg[P9100_REG_CTL]), 0,
diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c
index 2e444346c8a..3fad0439f34 100644
--- a/sys/arch/sparc/dev/tcx.c
+++ b/sys/arch/sparc/dev/tcx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcx.c,v 1.16 2003/04/06 17:02:32 miod Exp $	*/
+/*	$OpenBSD: tcx.c,v 1.17 2003/06/06 19:42:47 miod Exp $	*/
 /*	$NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */
 
 /*
@@ -213,8 +213,6 @@ tcxattach(parent, self, args)
 	int isconsole = 0;
 	char *nam = NULL;
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags & FB_USERMASK;
-
 	node = ca->ca_ra.ra_node;
 	nam = getpropstring(node, "model");
 	printf(": %s\n", nam);
@@ -276,12 +274,11 @@ tcxattach(parent, self, args)
 	tcx_stdscreen.ncols = sc->sc_sunfb.sf_ro.ri_cols;
 	tcx_stdscreen.textops = &sc->sc_sunfb.sf_ro.ri_ops;
 
-	if (ISSET(sc->sc_sunfb.sf_flags, TCX_INTR)) {
-		sc->sc_ih.ih_fun = tcx_intr;
-		sc->sc_ih.ih_arg = sc;
-		intr_establish(ca->ca_ra.ra_intr[0].int_pri, &sc->sc_ih,
-		    IPL_FB);
-	}
+#if 0
+	sc->sc_ih.ih_fun = tcx_intr;
+	sc->sc_ih.ih_arg = sc;
+	intr_establish(ca->ca_ra.ra_intr[0].int_pri, &sc->sc_ih, IPL_FB);
+#endif
 
 	if (isconsole) {
 		fbwscons_console_init(&sc->sc_sunfb, &tcx_stdscreen, -1,
@@ -355,12 +352,11 @@ tcx_ioctl(dev, cmd, data, flags, p)
 		error = bt_putcmap(&sc->sc_cmap, cm);
 		if (error)
 			return (error);
-		if (ISSET(sc->sc_sunfb.sf_flags, TCX_INTR)) {
-			tcx_loadcmap_deferred(sc, cm->index, cm->count);
-		} else {
-			bt_loadcmap(&sc->sc_cmap, sc->sc_bt,
-			    cm->index, cm->count, 1);
-		}
+#if 0
+		tcx_loadcmap_deferred(sc, cm->index, cm->count);
+#else
+		bt_loadcmap(&sc->sc_cmap, sc->sc_bt, cm->index, cm->count, 1);
+#endif
 		break;
 
 	case WSDISPLAYIO_SMODE:
diff --git a/sys/arch/sparc/dev/tcxreg.h b/sys/arch/sparc/dev/tcxreg.h
index 40985634f61..b491e2b934e 100644
--- a/sys/arch/sparc/dev/tcxreg.h
+++ b/sys/arch/sparc/dev/tcxreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcxreg.h,v 1.3 2002/10/01 20:55:14 miod Exp $	*/
+/*	$OpenBSD: tcxreg.h,v 1.4 2003/06/06 19:42:47 miod Exp $	*/
 /*	$NetBSD: tcxreg.h,v 1.1 1996/06/19 13:17:35 pk Exp $ */
 
 /*
@@ -38,11 +38,6 @@
  */
 
 /*
- * User flags for tcx.
- */
-#define	TCX_INTR		0x00000002	/* use retrace interrupt */
-
-/*
  * A TCX is composed of numerous groups of control registers, all with TLAs:
  *	DHC - ???
  *	TEC - transform engine control?
diff --git a/sys/arch/sparc/dev/tvtwo.c b/sys/arch/sparc/dev/tvtwo.c
index b5b1fc797b4..ebb832069f0 100644
--- a/sys/arch/sparc/dev/tvtwo.c
+++ b/sys/arch/sparc/dev/tvtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tvtwo.c,v 1.1 2003/03/05 14:34:40 miod Exp $	*/
+/*	$OpenBSD: tvtwo.c,v 1.2 2003/06/06 19:42:47 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -205,7 +205,6 @@ tvtwoattach(struct device *parent, struct device *self, void *args)
 	int isconsole;
 	char *freqstring;
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags & FB_USERMASK;
 	node = ca->ca_ra.ra_node;
 
 	printf(": %s", getpropstring(node, "model"));
diff --git a/sys/arch/sparc/dev/vigra.c b/sys/arch/sparc/dev/vigra.c
index dd1b94a3c37..bb11b49b7dd 100644
--- a/sys/arch/sparc/dev/vigra.c
+++ b/sys/arch/sparc/dev/vigra.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vigra.c,v 1.7 2003/05/25 21:43:09 miod Exp $	*/
+/*	$OpenBSD: vigra.c,v 1.8 2003/06/06 19:42:47 miod Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
@@ -242,15 +242,9 @@ struct cfdriver vigra_cd = {
 int
 vigramatch(struct device *parent, void *vcf, void *aux)
 {
-	struct cfdata *cf = vcf;
 	struct confargs *ca = aux;
 	struct romaux *ra = &ca->ca_ra;
 
-	/*
-	 * Mask out invalid flags from the user.
-	 */
-	cf->cf_flags &= FB_USERMASK;
-
 	if (strcmp("vs10", ra->ra_name) != 0 &&
 	    strcmp("vs11", ra->ra_name) != 0 &&
 	    strcmp("vs12", ra->ra_name) != 0)
@@ -271,8 +265,6 @@ vigraattach(struct device *parent, struct device *self, void *args)
 	int node, row, isconsole = 0;
 	char *nam;
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags;
-
 	node = ca->ca_ra.ra_node;
 	nam = getpropstring(node, "model");
 	if (*nam == '\0')
diff --git a/sys/arch/sparc/dev/zx.c b/sys/arch/sparc/dev/zx.c
index b49939fa3d7..8ceb31e6d44 100644
--- a/sys/arch/sparc/dev/zx.c
+++ b/sys/arch/sparc/dev/zx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zx.c,v 1.2 2003/03/09 02:30:02 miod Exp $	*/
+/*	$OpenBSD: zx.c,v 1.3 2003/06/06 19:42:47 miod Exp $	*/
 /*	$NetBSD: zx.c,v 1.5 2002/10/02 16:52:46 thorpej Exp $	*/
 
 /*
@@ -200,15 +200,9 @@ struct cfdriver zx_cd = {
 int
 zx_match(struct device *parent, void *vcf, void *aux)
 {
-	struct cfdata *cf = vcf;
 	struct confargs *ca = aux;
 	struct romaux *ra = &ca->ca_ra;
 	
-	/*
-	 * Mask out invalid flags from the user.
-	 */
-	cf->cf_flags &= FB_USERMASK;
-
 	if (strcmp(ra->ra_name, "SUNW,leo") == 0)
 		return (1);
 
@@ -225,7 +219,6 @@ zx_attach(struct device *parent, struct device *self, void *args)
 	int node, isconsole = 0;
 	const char *nam;
 
-	sc->sc_sunfb.sf_flags = self->dv_cfdata->cf_flags;
 	ri = &sc->sc_sunfb.sf_ro;
 	node = ca->ca_ra.ra_node;