[src/trunk]: src/sys/external/bsd/drm2/nouveau Disable simplefb if nouveau at...

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

details:   https://anonhg.NetBSD.org/src/rev/79e5bf85797a
branches:  trunk
changeset: 744496:79e5bf85797a
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Feb 03 16:52:13 2020 +0000

description:
Disable simplefb if nouveau attaches

diffstat:

 sys/external/bsd/drm2/nouveau/nouveau_pci.c |  23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r d44c4fe5057c -r 79e5bf85797a sys/external/bsd/drm2/nouveau/nouveau_pci.c
--- a/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Mon Feb 03 16:22:52 2020 +0000
+++ b/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Mon Feb 03 16:52:13 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_pci.c,v 1.25 2019/10/05 22:37:49 mrg Exp $     */
+/*     $NetBSD: nouveau_pci.c,v 1.26 2020/02/03 16:52:13 jmcneill Exp $        */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.25 2019/10/05 22:37:49 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.26 2020/02/03 16:52:13 jmcneill Exp $");
+
+#ifdef _KERNEL_OPT
+#if defined(__arm__) || defined(__aarch64__)
+#include "opt_fdt.h"
+#endif
+#endif
 
 #include <sys/types.h>
 #include <sys/device.h>
@@ -43,6 +49,10 @@
 #include <core/device.h>
 #include <core/pci.h>
 
+#ifdef FDT
+#include <dev/fdt/fdtvar.h>
+#endif
+
 #include "nouveau_drm.h"
 #include "nouveau_pci.h"
 
@@ -154,6 +164,15 @@
        sc->sc_dev = NULL;
        sc->sc_pa = *pa;
 
+#ifdef FDT
+       /*
+        * XXX Remove the simple framebuffer, assuming that this device
+        * will take over.
+        */
+       const char *fb_compatible[] = { "simple-framebuffer", NULL };
+       fdt_remove_bycompat(fb_compatible);
+#endif
+
        config_mountroot(self, &nouveau_pci_attach_real);
 }