Commit 3615c786 authored by Hans de Goede's avatar Hans de Goede Committed by Ard Biesheuvel
Browse files

efi: sysfb_efi: Fix DMI quirks not working for simpledrm 



Commit 8633ef82 ("drivers/firmware: consolidate EFI framebuffer setup
for all arches") moved the sysfb_apply_efi_quirks() call in sysfb_init()
from before the [sysfb_]parse_mode() call to after it.
But sysfb_apply_efi_quirks() modifies the global screen_info struct which
[sysfb_]parse_mode() parses, so doing it later is too late.

This has broken all DMI based quirks for correcting wrong firmware efifb
settings when simpledrm is used.

To fix this move the sysfb_apply_efi_quirks() call back to its old place
and split the new setup of the efifb_fwnode (which requires
the platform_device) into its own function and call that at
the place of the moved sysfb_apply_efi_quirks(pd) calls.

Fixes: 8633ef82 ("drivers/firmware: consolidate EFI framebuffer setup for all arches")
Cc: stable@vger.kernel.org
Cc: Javier Martinez Canillas <javierm@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent f59a7ec1

drivers/firmware/efi/sysfb_efi.c

+4 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static const struct fwnode_operations efifb_fwnode_ops = { 
#ifdef CONFIG_EFI

static struct fwnode_handle efifb_fwnode;



__init void sysfb_apply_efi_quirks(struct platform_device *pd)

__init void sysfb_apply_efi_quirks(void)

{

	if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI ||

	    !(screen_info.capabilities & VIDEO_CAPABILITY_SKIP_QUIRKS))
@@ -355,7 +355,10 @@ __init void sysfb_apply_efi_quirks(struct platform_device *pd) 
		screen_info.lfb_height = temp;

		screen_info.lfb_linelength = 4 * screen_info.lfb_width;

	}

}



__init void sysfb_set_efifb_fwnode(struct platform_device *pd)

{

	if (screen_info.orig_video_isVGA == VIDEO_TYPE_EFI && IS_ENABLED(CONFIG_PCI)) {

		fwnode_init(&efifb_fwnode, &efifb_fwnode_ops);

		pd->dev.fwnode = &efifb_fwnode;

drivers/firmware/sysfb.c

+3 −1
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ static __init int sysfb_init(void) 
	if (disabled)

		goto unlock_mutex;



	sysfb_apply_efi_quirks();



	/* try to create a simple-framebuffer device */

	compatible = sysfb_parse_mode(si, &mode);

	if (compatible) {
@@ -107,7 +109,7 @@ static __init int sysfb_init(void) 
		goto unlock_mutex;

	}



	sysfb_apply_efi_quirks(pd);

	sysfb_set_efifb_fwnode(pd);



	ret = platform_device_add_data(pd, si, sizeof(*si));

	if (ret)

drivers/firmware/sysfb_simplefb.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ __init struct platform_device *sysfb_create_simplefb(const struct screen_info *s 
	if (!pd)

		return ERR_PTR(-ENOMEM);



	sysfb_apply_efi_quirks(pd);

	sysfb_set_efifb_fwnode(pd);



	ret = platform_device_add_resources(pd, &res, 1);

	if (ret)

include/linux/sysfb.h

+7 −2
Original line number Diff line number Diff line
@@ -70,11 +70,16 @@ static inline void sysfb_disable(void) 
#ifdef CONFIG_EFI



extern struct efifb_dmi_info efifb_dmi_list[];

void sysfb_apply_efi_quirks(struct platform_device *pd);

void sysfb_apply_efi_quirks(void);

void sysfb_set_efifb_fwnode(struct platform_device *pd);



#else /* CONFIG_EFI */



static inline void sysfb_apply_efi_quirks(struct platform_device *pd)

static inline void sysfb_apply_efi_quirks(void)

{

}



static inline void sysfb_set_efifb_fwnode(struct platform_device *pd)

{

}