Module Name: src
Committed By: thorpej
Date: Sat Apr 24 18:23:09 UTC 2021
Modified Files:
src/sys/arch/macppc/dev [thorpej-cfargs]: ofb.c
src/sys/dev/ic [thorpej-cfargs]: vga_raster.c
src/sys/dev/pci [thorpej-cfargs]: machfb.c radeonfb.c unichromefb.c
Log Message:
Make sure to explcitly specify the "wsemuldisplaydev" interface attribute
when attaching the wscons display instance, because these devices can
also attach children using the "drm" interface attribute.
To generate a diff of this commit:
cvs rdiff -u -r1.70.32.2 -r1.70.32.3 src/sys/arch/macppc/dev/ofb.c
cvs rdiff -u -r1.48.4.1 -r1.48.4.2 src/sys/dev/ic/vga_raster.c
cvs rdiff -u -r1.103.4.2 -r1.103.4.3 src/sys/dev/pci/machfb.c
cvs rdiff -u -r1.113.2.2 -r1.113.2.3 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.19.34.2 -r1.19.34.3 src/sys/dev/pci/unichromefb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/ofb.c
diff -u src/sys/arch/macppc/dev/ofb.c:1.70.32.2 src/sys/arch/macppc/dev/ofb.c:1.70.32.3
--- src/sys/arch/macppc/dev/ofb.c:1.70.32.2 Fri Apr 2 22:17:40 2021
+++ src/sys/arch/macppc/dev/ofb.c Sat Apr 24 18:23:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofb.c,v 1.70.32.2 2021/04/02 22:17:40 thorpej Exp $ */
+/* $NetBSD: ofb.c,v 1.70.32.3 2021/04/24 18:23:09 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.70.32.2 2021/04/02 22:17:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.70.32.3 2021/04/24 18:23:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -217,7 +217,9 @@ ofbattach(device_t parent, device_t self
a.accessops = &ofb_accessops;
a.accesscookie = &sc->vd;
- config_found(self, &a, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &a, wsemuldisplaydevprint,
+ CFARG_IATTR, "wsemuldisplaydev",
+ CFARG_EOL);
config_found(self, aux, ofb_drm_print,
CFARG_IATTR, "drm",
Index: src/sys/dev/ic/vga_raster.c
diff -u src/sys/dev/ic/vga_raster.c:1.48.4.1 src/sys/dev/ic/vga_raster.c:1.48.4.2
--- src/sys/dev/ic/vga_raster.c:1.48.4.1 Sun Mar 21 21:09:12 2021
+++ src/sys/dev/ic/vga_raster.c Sat Apr 24 18:23:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.48.4.1 2021/03/21 21:09:12 thorpej Exp $ */
+/* $NetBSD: vga_raster.c,v 1.48.4.2 2021/04/24 18:23:09 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.48.4.1 2021/03/21 21:09:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.48.4.2 2021/04/24 18:23:09 thorpej Exp $");
#include "opt_vga.h"
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -548,7 +548,9 @@ vga_common_attach(struct vga_softc *sc,
aa.accessops = &vga_raster_accessops;
aa.accesscookie = vc;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint,
+ CFARG_IATTR, "wsemuldisplaydev",
+ CFARG_EOL);
}
int
Index: src/sys/dev/pci/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.103.4.2 src/sys/dev/pci/machfb.c:1.103.4.3
--- src/sys/dev/pci/machfb.c:1.103.4.2 Fri Apr 2 22:17:44 2021
+++ src/sys/dev/pci/machfb.c Sat Apr 24 18:23:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.103.4.2 2021/04/02 22:17:44 thorpej Exp $ */
+/* $NetBSD: machfb.c,v 1.103.4.3 2021/04/24 18:23:09 thorpej Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
- "$NetBSD: machfb.c,v 1.103.4.2 2021/04/02 22:17:44 thorpej Exp $");
+ "$NetBSD: machfb.c,v 1.103.4.3 2021/04/24 18:23:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -785,7 +785,9 @@ mach64_attach(device_t parent, device_t
aa.accessops = &sc->sc_accessops;
aa.accesscookie = &sc->vd;
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint,
+ CFARG_IATTR, "wsemuldisplaydev",
+ CFARG_EOL);
#if 0
/* XXX
* turns out some firmware doesn't turn these back on when needed
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.113.2.2 src/sys/dev/pci/radeonfb.c:1.113.2.3
--- src/sys/dev/pci/radeonfb.c:1.113.2.2 Fri Apr 2 22:17:44 2021
+++ src/sys/dev/pci/radeonfb.c Sat Apr 24 18:23:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.113.2.2 2021/04/02 22:17:44 thorpej Exp $ */
+/* $NetBSD: radeonfb.c,v 1.113.2.3 2021/04/24 18:23:09 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.113.2.2 2021/04/02 22:17:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.113.2.3 2021/04/24 18:23:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1013,7 +1013,9 @@ radeonfb_attach(device_t parent, device_
aa.accessops = &radeonfb_accessops;
aa.accesscookie = &dp->rd_vd;
- config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint,
+ CFARG_IATTR, "wsemuldisplaydev",
+ CFARG_EOL);
radeonfb_blank(dp, 0);
Index: src/sys/dev/pci/unichromefb.c
diff -u src/sys/dev/pci/unichromefb.c:1.19.34.2 src/sys/dev/pci/unichromefb.c:1.19.34.3
--- src/sys/dev/pci/unichromefb.c:1.19.34.2 Fri Apr 2 22:17:44 2021
+++ src/sys/dev/pci/unichromefb.c Sat Apr 24 18:23:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: unichromefb.c,v 1.19.34.2 2021/04/02 22:17:44 thorpej Exp $ */
+/* $NetBSD: unichromefb.c,v 1.19.34.3 2021/04/24 18:23:09 thorpej Exp $ */
/*-
* Copyright (c) 2006, 2008 Jared D. McNeill <[email protected]>
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.19.34.2 2021/04/02 22:17:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.19.34.3 2021/04/24 18:23:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -351,7 +351,9 @@ unichromefb_attach(device_t parent, devi
aa.accessops = &unichromefb_accessops;
aa.accesscookie = &sc->sc_vd;
- config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &aa, wsemuldisplaydevprint,
+ CFARG_IATTR, "wsemuldisplaydev",
+ CFARG_EOL);
config_found(self, opaque, unichromefb_drm_print,
CFARG_IATTR, "drm",
