[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau don't consider it err...

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

details:   https://anonhg.NetBSD.org/src/rev/ba7b6406e6ce
branches:  trunk
changeset: 744779:ba7b6406e6ce
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed Feb 12 20:25:48 2020 +0000

description:
don't consider it error when nouveaufbbus fails to attach, it currently
can happen only not configured into the kernel

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c |  19 ++++++++++++++---
 1 files changed, 15 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 0b0753d2c6f1 -r ba7b6406e6ce sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c    Wed Feb 12 20:22:37 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c    Wed Feb 12 20:25:48 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_fbcon.c,v 1.6 2020/02/12 20:08:31 jdolecek Exp $       */
+/*     $NetBSD: nouveau_fbcon.c,v 1.7 2020/02/12 20:25:48 jdolecek Exp $       */
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.6 2020/02/12 20:08:31 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.7 2020/02/12 20:25:48 jdolecek Exp $");
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -356,6 +356,17 @@
 #endif
 }
 
+#ifdef __NetBSD__
+static int
+nouveau_fbcon_print(void *aux, const char *pnp)
+{
+       if (pnp)
+               aprint_normal("nouveaufbbus at %s", pnp);
+
+       return (UNCONF);
+}
+#endif
+
 static int
 nouveau_fbcon_create(struct drm_fb_helper *helper,
                     struct drm_fb_helper_surface_size *sizes)
@@ -432,9 +443,9 @@
        nfa.nfa_fb_ptr = nvbo_kmap_obj_iovirtual(nvbo);
        nfa.nfa_fb_linebytes = mode_cmd.pitches[0];
 
-       helper->fbdev = config_found_ia(dev->dev, "nouveaufbbus", &nfa, NULL);
+       helper->fbdev = config_found_ia(dev->dev, "nouveaufbbus", &nfa,
+           nouveau_fbcon_print);
        if (helper->fbdev == NULL) {
-               DRM_ERROR("failed to attach nouveaufb\n");
                goto out_unlock;
        }
     }