[PATCH] vga_switcheroo: Depend upon fbcon being built-in, if enabled

Daniel Vetter daniel at ffwll.ch
Mon Jun 24 14:03:21 UTC 2019


On Mon, Jun 24, 2019 at 03:07:26PM +0200, Maarten Lankhorst wrote:
> Op 24-06-2019 om 11:21 schreef Daniel Vetter:
> > Fixes linking fail when fbcon/fbdev is modular and vgaswitcheroo is
> > enabled:
> >
> > x86_64-linux-gnu-ld: drivers/gpu/vga/vga_switcheroo.o: in function `vga_switchto_stage2':
> > vga_switcheroo.c:(.text+0x997): undefined reference to `fbcon_remap_all'
> >
> > v2: I first tried to fix this with an EXPORT_SYMBOL, but vga_switcheroo is
> > never a module, so this doesn't work.
> >
> > Reported-by: Stephen Rothwell <sfr at canb.auug.org.au>
> > Reported-by: kbuild test robot <lkp at intel.com>
> > Fixes: 1cd51b5d200d ("vgaswitcheroo: call fbcon_remap_all directly")
> > Cc: Stephen Rothwell <sfr at canb.auug.org.au>
> > Cc: Lukas Wunner <lukas at wunner.de>
> > Cc: Daniel Vetter <daniel.vetter at intel.com>
> > Cc: Sam Ravnborg <sam at ravnborg.org>
> > Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > Cc: David Airlie <airlied at linux.ie>
> > Cc: Daniel Vetter <daniel at ffwll.ch>
> > Cc: Maxime Ripard <maxime.ripard at bootlin.com>
> > Cc: Sean Paul <sean at poorly.run>
> > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie at samsung.com>
> > Cc: Hans de Goede <hdegoede at redhat.com>
> > Cc: Yisheng Xie <ysxie at foxmail.com>
> > Cc: linux-fbdev at vger.kernel.org
> > Cc: Daniel Thompson <daniel.thompson at linaro.org>
> > Cc: Lee Jones <lee.jones at linaro.org>
> > Cc: dri-devel at lists.freedesktop.org
> > Cc: linux-fbdev at vger.kernel.org
> > --
> > wrt merging probably best if Maarten adds this to the topic branch we
> > have already and sends out an updated pull request.
> >
> > Apologies for the mess.
> > -Daniel
> > ---
> >  drivers/gpu/vga/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
> > index 84ab482d0db6..c8c770b05ed9 100644
> > --- a/drivers/gpu/vga/Kconfig
> > +++ b/drivers/gpu/vga/Kconfig
> > @@ -23,6 +23,7 @@ config VGA_SWITCHEROO
> >  	depends on X86
> >  	depends on ACPI
> >  	depends on PCI
> > +	depends on (FRAMEBUFFER_CONSOLE=n || FB=y)
> >  	select VGA_ARB
> >  	help
> >  	  Many laptops released in 2008/9/10 have two GPUs with a multiplexer
> 
> In a default allmodconfig we disable vgaswitcheroo then. Not sure it's an issue. Just worth noting. :)

If you haven't applied yet, might be good to add that note to the commit
message when you merge.

Thanks, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list