[PATCH] drm/nouveau: try to load fbcon

[Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]

On Wed, Aug 25, 2010 at 06:15:53PM +0200, Francisco Jerez wrote:
> Dragos Delcea <dragos.delcea-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:
> 
> > Hi,
> >
> > I noticed that loading nouveau doesn't load fbcon automatically; and without fbcon, when loading nouveau the
> > console turns blank. I spent a few good hours until I was able to figure out that I had to manually modprobe
> > fbcon to get the console back after loading nouveau.
> > This is happening on a vanilla 2.6.35.3; shouldn't there be dependencies in place between modules?
> >
> > Note that I haven't got to the xorg part just yet, I'm currently installing gentoo.
> >
> We already do, except for kernels compiled with "Configure standard
> kernel features (for small systems)". Strictly speaking, nouveau doesn't
> depend on fbcon so that option is left open for e.g. embedded platforms
> that don't need a framebuffer console.

But it's only a build time dependency. Let's fix it.

---
From: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH] drm/nouveau: try to load fbcon

Currently users have to load fbcon manually or build it
into the kernel to have any console output.
Let's make it easy for them and load fbcon automatically
at init time. Nouveau already selects fbcon at build time
when !EMBEDDED.

Reported-by: Dragos Delcea <dragos.delcea-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/gpu/drm/nouveau/nouveau_drv.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index a8d3d17..df9a687 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -434,6 +434,12 @@ static int __init nouveau_init(void)
 	if (!nouveau_modeset)
 		return 0;
 
+#if defined(CONFIG_FRAMEBUFFER_CONSOLE_MODULE)
+	request_module("fbcon");
+#elif !defined(CONFIG_FRAMEBUFFER_CONSOLE)
+	printk(KERN_INFO "CONFIG_FRAMEBUFFER_CONSOLE was not enabled. You won't get any console output.\n");
+#endif
+
 	nouveau_register_dsm_handler();
 	return drm_init(&driver);
 }
-- 
1.7.1.1