[Nouveau] [PATCH] drm/nouveau: try to load fbcon
currojerez at riseup.net
Wed Aug 25 15:39:36 PDT 2010
Marcin Slusarz <marcin.slusarz at gmail.com> writes:
> On Wed, Aug 25, 2010 at 06:15:53PM +0200, Francisco Jerez wrote:
>> Dragos Delcea <dragos.delcea at gmail.com> 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 22.214.171.124; 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 at gmail.com>
> 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 at gmail.com>
> Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
> 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");
> return drm_init(&driver);
Pushed to master, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 229 bytes
Desc: not available
More information about the Nouveau