From patchwork Mon Apr 25 20:06:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 66612 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1233156qge; Mon, 25 Apr 2016 13:08:17 -0700 (PDT) X-Received: by 10.98.11.78 with SMTP id t75mr50787274pfi.72.1461614891489; Mon, 25 Apr 2016 13:08:11 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qg6si8615165pac.60.2016.04.25.13.08.11; Mon, 25 Apr 2016 13:08:11 -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; dkim=pass header.i=@codeblueprint-co-uk.20150623.gappssmtp.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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965019AbcDYUII (ORCPT + 29 others); Mon, 25 Apr 2016 16:08:08 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:37124 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933510AbcDYUIF (ORCPT ); Mon, 25 Apr 2016 16:08:05 -0400 Received: by mail-wm0-f50.google.com with SMTP id n3so145602166wmn.0 for ; Mon, 25 Apr 2016 13:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeblueprint-co-uk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cta/CD9DtEqOiXhDbG16j7tmV5P18esBLsE+1HC7Lls=; b=FhK5rvO37mGGwtTpNXYtVJM6jSe7CuLETtNKj4SxJnO0RPdRmtBzNGd57BepRty/r4 ya46U6yZKZNqZSgPUZSTsPaIdehm14rDFmh1tg0k1qJ3EjXZiXGKFBqswYnY8MVbAYqJ 7+V7iurrIX9kkWz8wLocQya2Jrmx3FesLATewnCq1dLoXk3p95B87kySRCRpjdxvBASr v/C0mYHM0Y2NOq7SmQHQ4EOIaA21tw5NGlkxS2iabtFzQv5n57YsvL8u3WrxDxzx+mm3 0a/xHnZxjq5rrfk5z3SGrl50OUb0h6KnLL8HKpjClbWchMBfibIzTscfFfAXSQX58zYe RhSQ== 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=cta/CD9DtEqOiXhDbG16j7tmV5P18esBLsE+1HC7Lls=; b=R+tJzCiQTSU1RgUeU1mszDqOdo5+Piidw8zI+RN1a97y991jkGEhozxDWuSjoEeQYK TfGdyeg+SOVsKbY3tAsSWW5gcPNWIHfjmANJVmONDJkwXrU/rfdd5/ngrYTIE2+rk0+i C5zzMNxlyvuJ1FWOoCd+vKJkz5DoC6SPrd8dpZeTxKUIio53drZZaTaTZjabzLudb7g7 xaYnmysts/SsJglXY9kWLphndR9WD65Defx+uCykwlRJ35HT2QkDc1Q1dAy1NfSf2hSe q1rkUpxyU5lkPUwmH7k6RdYo3qaqYwUYvPkv1WT5dJW/5fGI6kdRBAlMXwtOB1XbzlZ1 w1bg== X-Gm-Message-State: AOPr4FUIv7iwszgLgQx71mUYB0tj8eXVhj9JzKKGNXWMoDdPwsfrHdhdTF1ehJBtEwtqiQ== X-Received: by 10.28.63.15 with SMTP id m15mr7843107wma.55.1461614883678; Mon, 25 Apr 2016 13:08:03 -0700 (PDT) Received: from localhost (bcdc58e5.skybroadband.com. [188.220.88.229]) by smtp.gmail.com with ESMTPSA id k139sm20325161wmg.24.2016.04.25.13.08.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Apr 2016 13:08:03 -0700 (PDT) From: Matt Fleming To: Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Matt Fleming , David Herrmann , Mark Rutland , Peter Jones , Will Deacon Subject: [PATCH 24/40] efifb: Enable the efi-framebuffer platform driver for ARM and arm64 Date: Mon, 25 Apr 2016 21:06:56 +0100 Message-Id: <1461614832-17633-25-git-send-email-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1461614832-17633-1-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-1-git-send-email-matt@codeblueprint.co.uk> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel 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 Cc: Mark Rutland Cc: Will Deacon Cc: David Herrmann Cc: Peter Jones Signed-off-by: Matt Fleming --- 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.7.3 diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h index 25f8b1162c2e..b45fe39bf35b 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 fa09886f72e6..79dc8c237c7e 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 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