[src/thorpej-cfargs]: src/sys/dev/pci Make sure to explcitly specify the "wse...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1fb3df952f9b
branches:  thorpej-cfargs
changeset: 961890:1fb3df952f9b
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Apr 24 18:23:09 2021 +0000

description:
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.

diffstat:

 sys/arch/macppc/dev/ofb.c |  8 +++++---
 sys/dev/ic/vga_raster.c   |  8 +++++---
 sys/dev/pci/machfb.c      |  8 +++++---
 sys/dev/pci/radeonfb.c    |  8 +++++---
 sys/dev/pci/unichromefb.c |  8 +++++---
 5 files changed, 25 insertions(+), 15 deletions(-)

diffs (145 lines):

diff -r 1e19271b8619 -r 1fb3df952f9b sys/arch/macppc/dev/ofb.c
--- a/sys/arch/macppc/dev/ofb.c Sat Apr 24 18:07:07 2021 +0000
+++ b/sys/arch/macppc/dev/ofb.c Sat Apr 24 18:23:09 2021 +0000
@@ -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 @@
        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",
diff -r 1e19271b8619 -r 1fb3df952f9b sys/dev/ic/vga_raster.c
--- a/sys/dev/ic/vga_raster.c   Sat Apr 24 18:07:07 2021 +0000
+++ b/sys/dev/ic/vga_raster.c   Sat Apr 24 18:23:09 2021 +0000
@@ -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 @@
        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
diff -r 1e19271b8619 -r 1fb3df952f9b sys/dev/pci/machfb.c
--- a/sys/dev/pci/machfb.c      Sat Apr 24 18:07:07 2021 +0000
+++ b/sys/dev/pci/machfb.c      Sat Apr 24 18:23:09 2021 +0000
@@ -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 @@
        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
diff -r 1e19271b8619 -r 1fb3df952f9b sys/dev/pci/radeonfb.c
--- a/sys/dev/pci/radeonfb.c    Sat Apr 24 18:07:07 2021 +0000
+++ b/sys/dev/pci/radeonfb.c    Sat Apr 24 18:23:09 2021 +0000
@@ -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 @@
                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);
 
diff -r 1e19271b8619 -r 1fb3df952f9b sys/dev/pci/unichromefb.c
--- a/sys/dev/pci/unichromefb.c Sat Apr 24 18:07:07 2021 +0000
+++ b/sys/dev/pci/unichromefb.c Sat Apr 24 18:23:09 2021 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
        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",