Messages in this thread | | | Date | Tue, 27 Jul 2021 11:54:14 +0200 | From | Daniel Vetter <> | Subject | Re: [PATCH] efi: sysfb_efi: fix build when EFI is not set |
| |
On Tue, Jul 27, 2021 at 11:15:36AM +0200, Thomas Zimmermann wrote: > Hi > > Am 27.07.21 um 07:04 schrieb Randy Dunlap: > > When # CONFIG_EFI is not set, there are 2 definitions of > > sysfb_apply_efi_quirks(). The stub from sysfb.h should be used > > and the __init function from sysfb_efi.c should not be used. > > > > ../drivers/firmware/efi/sysfb_efi.c:337:13: error: redefinition of ‘sysfb_apply_efi_quirks’ > > __init void sysfb_apply_efi_quirks(struct platform_device *pd) > > ^~~~~~~~~~~~~~~~~~~~~~ > > In file included from ../drivers/firmware/efi/sysfb_efi.c:26:0: > > ../include/linux/sysfb.h:65:20: note: previous definition of ‘sysfb_apply_efi_quirks’ was here > > static inline void sysfb_apply_efi_quirks(struct platform_device *pd) > > ^~~~~~~~~~~~~~~~~~~~~~ > > > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > > Cc: Ard Biesheuvel <ardb@kernel.org> > > Cc: linux-efi@vger.kernel.org > > Cc: dri-devel@lists.freedesktop.org > > Cc: Javier Martinez Canillas <javierm@redhat.com> > > Cc: Thomas Zimmermann <tzimmermann@suse.de> > > Cc: Mark Brown <broonie@kernel.org> > > Cc: linux-next@vger.kernel.org > > Thanks for the patch. It should have a fixes line > > > dim fixes 8633ef82f101c040427b57d4df7b706261420b94 > > Fixes: 8633ef82f101 ("drivers/firmware: consolidate EFI framebuffer setup > for all arches")
Added this and pushed to drm-next (because atm drm-next isn't in linux-next because of this).
drm-next also has -rc3 backmerge for the nouveau fix, so I think a good time to backmerge the entire pile into drm-misc-next? -Daniel
> > > ... and maybe a few more of the CCs below > > Cc: Javier Martinez Canillas <javierm@redhat.com> > > Cc: Borislav Petkov <bp@suse.de> > > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > > Cc: Thomas Zimmermann <tzimmermann@suse.de> > > Cc: Ard Biesheuvel <ardb@kernel.org> > > Cc: Paul Walmsley <paul.walmsley@sifive.com> > > Cc: Palmer Dabbelt <palmer@dabbelt.com> > > Cc: Albert Ou <aou@eecs.berkeley.edu> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Cc: Linus Walleij <linus.walleij@linaro.org> > > Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> > > Cc: John Stultz <john.stultz@linaro.org> > > Cc: Colin Ian King <colin.king@canonical.com> > > Cc: Nicolas Saenz Julienne <nsaenz@kernel.org> > > Cc: Sudeep Holla <sudeep.holla@arm.com> > > Cc: Maxime Ripard <maxime@cerno.tech> > > Cc: linux-efi@vger.kernel.org > > Cc: linux-riscv@lists.infradead.org > > > Best regards > Thomas > > > --- > > drivers/firmware/efi/sysfb_efi.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > --- linext-20210726.orig/drivers/firmware/efi/sysfb_efi.c > > +++ linext-20210726/drivers/firmware/efi/sysfb_efi.c > > @@ -332,6 +332,7 @@ static const struct fwnode_operations ef > > .add_links = efifb_add_links, > > }; > > +#ifdef CONFIG_EFI > > static struct fwnode_handle efifb_fwnode; > > __init void sysfb_apply_efi_quirks(struct platform_device *pd) > > @@ -354,3 +355,4 @@ __init void sysfb_apply_efi_quirks(struc > > pd->dev.fwnode = &efifb_fwnode; > > } > > } > > +#endif > > > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer >
-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
| |