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 <[email protected]> > > Cc: Ard Biesheuvel <[email protected]> > > Cc: [email protected] > > Cc: [email protected] > > Cc: Javier Martinez Canillas <[email protected]> > > Cc: Thomas Zimmermann <[email protected]> > > Cc: Mark Brown <[email protected]> > > Cc: [email protected] > > 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 <[email protected]> > > Cc: Borislav Petkov <[email protected]> > > Cc: Daniel Vetter <[email protected]> > > Cc: Thomas Zimmermann <[email protected]> > > Cc: Ard Biesheuvel <[email protected]> > > Cc: Paul Walmsley <[email protected]> > > Cc: Palmer Dabbelt <[email protected]> > > Cc: Albert Ou <[email protected]> > > Cc: Greg Kroah-Hartman <[email protected]> > > Cc: Linus Walleij <[email protected]> > > Cc: Krzysztof Kozlowski <[email protected]> > > Cc: John Stultz <[email protected]> > > Cc: Colin Ian King <[email protected]> > > Cc: Nicolas Saenz Julienne <[email protected]> > > Cc: Sudeep Holla <[email protected]> > > Cc: Maxime Ripard <[email protected]> > > Cc: [email protected] > > Cc: [email protected] > > > 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
