Skip to content

Commit e65ca16

Browse files
arndbardbiesheuvel
authored andcommitted
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: 4fcae63 ("sysfb: Move edid_info into sysfb_primary_display") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202602111543.Do4nkY5l-lkp@intel.com/ Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
1 parent 9702969 commit e65ca16

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/firmware/efi/efi-init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ extern __weak const efi_config_table_type_t efi_arch_tables[];
6060
* x86 defines its own instance of sysfb_primary_display and uses
6161
* it even without EFI, everything else can get them from here.
6262
*/
63-
#if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON))
63+
#if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON)) || defined(CONFIG_FIRMWARE_EDID)
6464
struct sysfb_display_info sysfb_primary_display __section(".data");
6565
EXPORT_SYMBOL_GPL(sysfb_primary_display);
6666
#endif

0 commit comments

Comments
 (0)