Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753419AbcD1Kko (ORCPT ); Thu, 28 Apr 2016 06:40:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47980 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752622AbcD1Kkm (ORCPT ); Thu, 28 Apr 2016 06:40:42 -0400 Date: Thu, 28 Apr 2016 03:39:35 -0700 From: tip-bot for Ard Biesheuvel Message-ID: Cc: bp@alien8.de, mark.rutland@arm.com, hpa@zytor.com, will.deacon@arm.com, peterz@infradead.org, matt@codeblueprint.co.uk, dh.herrmann@gmail.com, ard.biesheuvel@linaro.org, mingo@kernel.org, linux-kernel@vger.kernel.org, pjones@redhat.com, tglx@linutronix.de Reply-To: tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, pjones@redhat.com, will.deacon@arm.com, peterz@infradead.org, dh.herrmann@gmail.com, matt@codeblueprint.co.uk, ard.biesheuvel@linaro.org, bp@alien8.de, hpa@zytor.com, mark.rutland@arm.com In-Reply-To: <1461614832-17633-25-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-25-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efifb: Enable the efi-framebuffer platform driver for ARM and arm64 Git-Commit-ID: 9822504c1fa5c557ea8776765f03fd16eb4de4c9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2790 Lines: 74 Commit-ID: 9822504c1fa5c557ea8776765f03fd16eb4de4c9 Gitweb: http://git.kernel.org/tip/9822504c1fa5c557ea8776765f03fd16eb4de4c9 Author: Ard Biesheuvel AuthorDate: Mon, 25 Apr 2016 21:06:56 +0100 Committer: Ingo Molnar CommitDate: Thu, 28 Apr 2016 11:34:01 +0200 efifb: Enable the efi-framebuffer platform driver for ARM and arm64 Allows the efifb driver to be built for ARM and arm64. This simply involves updating the Kconfig dependency expression, and supplying dummy versions of efifb_setup_from_dmi(). Signed-off-by: Ard Biesheuvel Signed-off-by: Matt Fleming Cc: Borislav Petkov Cc: David Herrmann Cc: Mark Rutland Cc: Peter Jones Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Will Deacon Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1461614832-17633-25-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- arch/arm/include/asm/efi.h | 4 ++++ arch/arm64/include/asm/efi.h | 4 ++++ drivers/video/fbdev/Kconfig | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h index 25f8b11..b45fe39 100644 --- a/arch/arm/include/asm/efi.h +++ b/arch/arm/include/asm/efi.h @@ -67,6 +67,10 @@ void efi_virtmap_unload(void); struct screen_info *alloc_screen_info(efi_system_table_t *sys_table_arg); void free_screen_info(efi_system_table_t *sys_table, struct screen_info *si); +static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt) +{ +} + /* * A reasonable upper bound for the uncompressed kernel size is 32 MBytes, * so we will reserve that amount of memory. We have no easy way to tell what diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index fa09886..79dc8c2 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -59,6 +59,10 @@ int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); #define alloc_screen_info(x...) &screen_info #define free_screen_info(x...) +static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt) +{ +} + #define EFI_ALLOC_ALIGN SZ_64K /* diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 983280e..e5a391a 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -761,7 +761,7 @@ config FB_VESA config FB_EFI bool "EFI-based Framebuffer Support" - depends on (FB = y) && X86 && EFI + depends on (FB = y) && !IA64 && EFI select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT