Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1361862
| From | David Herrmann <dh.herrmann@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v2 3/9] efi/x86: efifb: move DMI based quirks handling out of generic code |
| Date | 2016-03-21 15:00 +0100 |
| Message-ID | <rf8xb-6rV-5@gated-at.bofh.it> (permalink) |
| References | <re5L4-23u-19@gated-at.bofh.it> <re5L5-23u-41@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Hi
On Fri, Mar 18, 2016 at 5:47 PM, Ard Biesheuvel
<ard.biesheuvel@linaro.org> wrote:
> The efifb quirks handling based on DMI identification of the platform is
> specific to x86, so move it to x86 arch code.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Fine with me:
Acked-by: David Herrmann <dh.herrmann@gmail.com>
Thanks
David
> ---
> arch/x86/include/asm/efi.h | 2 ++
> arch/x86/kernel/sysfb_efi.c | 15 +++++++++++++++
> drivers/video/fbdev/efifb.c | 15 ++++-----------
> 3 files changed, 21 insertions(+), 11 deletions(-)
>
> diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
> index 7d5187b66108..790adbc3a64a 100644
> --- a/arch/x86/include/asm/efi.h
> +++ b/arch/x86/include/asm/efi.h
> @@ -154,6 +154,8 @@ static inline bool efi_runtime_supported(void)
> extern struct console early_efi_console;
> extern void parse_efi_setup(u64 phys_addr, u32 data_len);
>
> +extern void efifb_setup_from_dmi(struct screen_info *si, const char *opt);
> +
> #ifdef CONFIG_EFI_MIXED
> extern void efi_thunk_runtime_setup(void);
> extern efi_status_t efi_thunk_set_virtual_address_map(
> diff --git a/arch/x86/kernel/sysfb_efi.c b/arch/x86/kernel/sysfb_efi.c
> index b285d4e8c68e..e21a8a7ddcff 100644
> --- a/arch/x86/kernel/sysfb_efi.c
> +++ b/arch/x86/kernel/sysfb_efi.c
> @@ -68,6 +68,21 @@ struct efifb_dmi_info efifb_dmi_list[] = {
> [M_UNKNOWN] = { NULL, 0, 0, 0, 0, OVERRIDE_NONE }
> };
>
> +void efifb_setup_from_dmi(struct screen_info *si, const char *opt)
> +{
> + int i;
> +
> + for (i = 0; i < M_UNKNOWN; i++) {
> + if (efifb_dmi_list[i].base != 0 &&
> + !strcmp(opt, efifb_dmi_list[i].optname)) {
> + si->lfb_base = efifb_dmi_list[i].base;
> + si->lfb_linelength = efifb_dmi_list[i].stride;
> + si->lfb_width = efifb_dmi_list[i].width;
> + si->lfb_height = efifb_dmi_list[i].height;
> + }
> + }
> +}
> +
> #define choose_value(dmivalue, fwvalue, field, flags) ({ \
> typeof(fwvalue) _ret_ = fwvalue; \
> if ((flags) & (field)) \
> diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
> index 95d293b7445a..dd594369b8a6 100644
> --- a/drivers/video/fbdev/efifb.c
> +++ b/drivers/video/fbdev/efifb.c
> @@ -8,6 +8,7 @@
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> +#include <linux/efi.h>
> #include <linux/errno.h>
> #include <linux/fb.h>
> #include <linux/platform_device.h>
> @@ -15,7 +16,7 @@
> #include <linux/dmi.h>
> #include <linux/pci.h>
> #include <video/vga.h>
> -#include <asm/sysfb.h>
> +#include <asm/efi.h>
>
> static bool request_mem_succeeded = false;
>
> @@ -85,21 +86,13 @@ static struct fb_ops efifb_ops = {
> static int efifb_setup(char *options)
> {
> char *this_opt;
> - int i;
>
> if (options && *options) {
> while ((this_opt = strsep(&options, ",")) != NULL) {
> if (!*this_opt) continue;
>
> - for (i = 0; i < M_UNKNOWN; i++) {
> - if (efifb_dmi_list[i].base != 0 &&
> - !strcmp(this_opt, efifb_dmi_list[i].optname)) {
> - screen_info.lfb_base = efifb_dmi_list[i].base;
> - screen_info.lfb_linelength = efifb_dmi_list[i].stride;
> - screen_info.lfb_width = efifb_dmi_list[i].width;
> - screen_info.lfb_height = efifb_dmi_list[i].height;
> - }
> - }
> + efifb_setup_from_dmi(&screen_info, this_opt);
> +
> if (!strncmp(this_opt, "base:", 5))
> screen_info.lfb_base = simple_strtoul(this_opt+5, NULL, 0);
> else if (!strncmp(this_opt, "stride:", 7))
> --
> 2.5.0
>
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/9] EFI framebuffer support for ARM and arm64 Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
[PATCH v2 4/9] efi: efifb: use builtin_platform_driver and drop unused includes Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
[PATCH v2 8/9] efi/arm*: wire up struct screen_info to efi-framebuffer platform device Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
Re: [PATCH v2 8/9] efi/arm*: wire up struct screen_info to efi-framebuffer platform device David Herrmann <dh.herrmann@gmail.com> - 2016-03-21 15:00 +0100
[PATCH v2 3/9] efi/x86: efifb: move DMI based quirks handling out of generic code Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
Re: [PATCH v2 3/9] efi/x86: efifb: move DMI based quirks handling out of generic code David Herrmann <dh.herrmann@gmail.com> - 2016-03-21 15:00 +0100
[PATCH v2 5/9] efi/arm64: libstub: make screen_info accessible to the UEFI stub Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
[PATCH v2 9/9] efifb: enable the efi-framebuffer platform driver for ARM and arm64 Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
[PATCH v2 1/9] efi/x86: prepare GOP handling code for reuse as generic code Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
[PATCH v2 2/9] efi: libstub: move Graphics Output Protocol handling to generic code Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 18:00 +0100
[PATCH v2 7/9] efi/arm*: libstub: wire up GOP protocol to struct screen_info Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 18:00 +0100
[PATCH v2 6/9] efi/arm: libstub: make screen_info accessible to the UEFI stub Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 18:00 +0100
csiph-web