[src/trunk]: src/sys/external/bsd/drm2/radeon If radeon attaches, prevent sim...

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

details:   https://anonhg.NetBSD.org/src/rev/2b35e83baf5d
branches:  trunk
changeset: 848305:2b35e83baf5d
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Jan 24 11:44:27 2020 +0000

description:
If radeon attaches, prevent simplefb from claiming the console

diffstat:

 sys/external/bsd/drm2/radeon/radeon_pci.c |  20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r 29757c87d4e6 -r 2b35e83baf5d sys/external/bsd/drm2/radeon/radeon_pci.c
--- a/sys/external/bsd/drm2/radeon/radeon_pci.c Fri Jan 24 10:49:41 2020 +0000
+++ b/sys/external/bsd/drm2/radeon/radeon_pci.c Fri Jan 24 11:44:27 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_pci.c,v 1.13 2018/08/27 14:12:14 riastradh Exp $        */
+/*     $NetBSD: radeon_pci.c,v 1.14 2020/01/24 11:44:27 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,10 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.13 2018/08/27 14:12:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.14 2020/01/24 11:44:27 jmcneill Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
+#if defined(__arm__) || defined(__aarch64__)
+#include "opt_fdt.h"
+#endif
 #endif
 
 #include <sys/types.h>
@@ -60,6 +63,10 @@
 #include <dev/ic/vgavar.h>
 #endif
 
+#ifdef FDT
+#include <dev/fdt/fdtvar.h>
+#endif
+
 #include <drm/drmP.h>
 #include <drm/drm_fb_helper.h>
 
@@ -201,6 +208,15 @@
                                       "i386 radeondrmkms hack\n");
 #endif
 
+#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, &radeon_attach_real);
 }