Module Name: src
Committed By: jmcneill
Date: Fri Jan 24 11:44:27 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/radeon: radeon_pci.c
Log Message:
If radeon attaches, prevent simplefb from claiming the console
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/radeon/radeon_pci.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/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.13 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.14
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.13 Mon Aug 27 14:12:14 2018
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c Fri Jan 24 11:44:27 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_pci.c
#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 @@ radeon_attach(device_t parent, device_t
"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);
}
