Commit e65ca164 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Ard Biesheuvel
Browse files

efi: export sysfb_primary_display for EDID 



The sysfb_primary_display structure is now part of efi-init.c but
conditionally defined. One of the users is missing in the condition:

aarch64-linux-ld: drivers/video/fbdev/core/fbmon.o: in function `fb_firmware_edid':
fbmon.c:(.text.fb_firmware_edid+0x3c): undefined reference to `sysfb_primary_display'

Export it whenever CONFIG_FIRMWARE_EDID is set, so the fbdev core
code can use it.

Fixes: 4fcae635 ("sysfb: Move edid_info into sysfb_primary_display")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202602111543.Do4nkY5l-lkp@intel.com/


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 97029699

drivers/firmware/efi/efi-init.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ extern __weak const efi_config_table_type_t efi_arch_tables[]; 
 * x86 defines its own instance of sysfb_primary_display and uses

 * it even without EFI, everything else can get them from here.

 */

#if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON))

#if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON)) || defined(CONFIG_FIRMWARE_EDID)

struct sysfb_display_info sysfb_primary_display __section(".data");

EXPORT_SYMBOL_GPL(sysfb_primary_display);

#endif