Op 24-06-2019 om 16:03 schreef Daniel Vetter: > 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 <[email protected]> >>> Reported-by: kbuild test robot <[email protected]> >>> Fixes: 1cd51b5d200d ("vgaswitcheroo: call fbcon_remap_all directly") >>> Cc: Stephen Rothwell <[email protected]> >>> Cc: Lukas Wunner <[email protected]> >>> Cc: Daniel Vetter <[email protected]> >>> Cc: Sam Ravnborg <[email protected]> >>> Cc: Maarten Lankhorst <[email protected]> >>> Cc: David Airlie <[email protected]> >>> Cc: Daniel Vetter <[email protected]> >>> Cc: Maxime Ripard <[email protected]> >>> Cc: Sean Paul <[email protected]> >>> Cc: Bartlomiej Zolnierkiewicz <[email protected]> >>> Cc: Hans de Goede <[email protected]> >>> Cc: Yisheng Xie <[email protected]> >>> Cc: [email protected] >>> Cc: Daniel Thompson <[email protected]> >>> Cc: Lee Jones <[email protected]> >>> Cc: [email protected] >>> Cc: [email protected] >>> -- >>> 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
Thanks, pushed. :) _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
