From patchwork Fri Mar 18 16:47:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 64084 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp66855lbc; Fri, 18 Mar 2016 09:48:31 -0700 (PDT) X-Received: by 10.98.12.153 with SMTP id 25mr24989284pfm.27.1458319706074; Fri, 18 Mar 2016 09:48:26 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qz9si2578663pab.94.2016.03.18.09.48.25; Fri, 18 Mar 2016 09:48:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754285AbcCRQsU (ORCPT + 30 others); Fri, 18 Mar 2016 12:48:20 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:36329 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753589AbcCRQsO (ORCPT ); Fri, 18 Mar 2016 12:48:14 -0400 Received: by mail-wm0-f47.google.com with SMTP id l124so38077924wmf.1 for ; Fri, 18 Mar 2016 09:48:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aHP0yNlo/GzSM8sP9/7IiWZUB+WaKaRbOD4Cd5p6078=; b=RVA+ZLerl5ZjEu7JMBg/qICwgF/91fN/kkSEdsduNQ0RdtL+U/TZXIjlUKGwG6eCYm MgG00qoqvrprJRP+9ecl0qtRqFPgcubS1xquLVjeEhL5t3AyPzf/gTnFbU+//jVHGpLz O0qnlnKw9BTvnUV9AstgFRDvxh9M5KSZzri1M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aHP0yNlo/GzSM8sP9/7IiWZUB+WaKaRbOD4Cd5p6078=; b=NHAiPjq4wr43y5JBVihnoAgBctXVQ3p8V8SyB/HZSK3Z71YSud6IEdBcwzPOo4Np52 o/AVkLTmCEpdA8BaU6Eos4BhOBSvcwnzFt4Z8JrWLzwZ1d64Esz9ekFMUT9DXj2q+Gzi xNMNFDcuBmOmxxMyyl89vrPhrCi9ZlP35jnpSFAtKYOI97UQXbHJz6vcYFt78tM3hthw q8WlDWeVyVfzkuFWYm43DbHsAf4o+1M0ftEyyu7Opk0QTIk4rihefBcMNkM947Ea3hk6 l+fo45bdik2+iDWfnf4JpTQSvdxPVKiYA6HoxwF7s5hNdxNK/2n0oF3S+UYhpTchdCQy hjPA== X-Gm-Message-State: AD7BkJJPyMZWW7fj8bVGaOf1Ga8apDgrNV2Tvj+baYmdOL9ve7QLHqJchA1bcQMEB5I7NVcx X-Received: by 10.194.143.82 with SMTP id sc18mr16692860wjb.14.1458319688516; Fri, 18 Mar 2016 09:48:08 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id c71sm118646wmd.4.2016.03.18.09.48.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Mar 2016 09:48:07 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, matt@codeblueprint.co.uk, catalin.marinas@arm.com, will.deacon@arm.com, linux@arm.linux.org.uk, pjones@redhat.com, dh.herrmann@gmail.com Cc: leif.lindholm@linaro.org, mark.rutland@arm.com, x86@kernel.org, Ard Biesheuvel Subject: [PATCH v2 9/9] efifb: enable the efi-framebuffer platform driver for ARM and arm64 Date: Fri, 18 Mar 2016 17:47:41 +0100 Message-Id: <1458319661-19762-10-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458319661-19762-1-git-send-email-ard.biesheuvel@linaro.org> References: <1458319661-19762-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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(-) -- 2.5.0 diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h index be12877e8609..76ce7adde990 100644 --- a/arch/arm/include/asm/efi.h +++ b/arch/arm/include/asm/efi.h @@ -66,6 +66,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 ed6c85d3a583..ec43456e3ef1 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -57,6 +57,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 983280e8d93f..e5a391aecde1 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