From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Date: Mon, 24 Jun 2019 14:03:21 +0000 Subject: Re: [PATCH] vga_switcheroo: Depend upon fbcon being built-in, if enabled Message-Id: <20190624140321.GP12905@phenom.ffwll.local> List-Id: References: <20190624092153.23375-1-daniel.vetter@ffwll.ch> <8cb8c728-3ace-04e0-f6d5-215ffd7879c9@linux.intel.com> In-Reply-To: <8cb8c728-3ace-04e0-f6d5-215ffd7879c9@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Maarten Lankhorst Cc: Sean Paul , Stephen Rothwell , Hans de Goede , kbuild test robot , Bartlomiej Zolnierkiewicz , David Airlie , Daniel Vetter , linux-fbdev@vger.kernel.org, DRI Development , Yisheng Xie , Maxime Ripard , Daniel Vetter , Lee Jones , Daniel Thompson , Sam Ravnborg 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 > > Reported-by: kbuild test robot > > Fixes: 1cd51b5d200d ("vgaswitcheroo: call fbcon_remap_all directly") > > Cc: Stephen Rothwell > > Cc: Lukas Wunner > > Cc: Daniel Vetter > > Cc: Sam Ravnborg > > Cc: Maarten Lankhorst > > Cc: David Airlie > > Cc: Daniel Vetter > > Cc: Maxime Ripard > > Cc: Sean Paul > > Cc: Bartlomiej Zolnierkiewicz > > Cc: Hans de Goede > > Cc: Yisheng Xie > > Cc: linux-fbdev@vger.kernel.org > > Cc: Daniel Thompson > > Cc: Lee Jones > > Cc: dri-devel@lists.freedesktop.org > > Cc: linux-fbdev@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