From patchwork Fri Nov 14 12:53:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Henrik Rydberg X-Patchwork-Id: 5305911 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C4B719F818 for ; Fri, 14 Nov 2014 13:19:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED27220145 for ; Fri, 14 Nov 2014 13:19:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13F1B2013D for ; Fri, 14 Nov 2014 13:19:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161044AbaKNNT2 (ORCPT ); Fri, 14 Nov 2014 08:19:28 -0500 Received: from smtprelay-h21.telenor.se ([195.54.99.196]:52831 "EHLO smtprelay-h21.telenor.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161043AbaKNNT0 (ORCPT ); Fri, 14 Nov 2014 08:19:26 -0500 X-Greylist: delayed 1550 seconds by postgrey-1.27 at vger.kernel.org; Fri, 14 Nov 2014 08:19:25 EST Received: from ipb5.telenor.se (ipb5.telenor.se [195.54.127.168]) by smtprelay-h21.telenor.se (Postfix) with ESMTP id 31AB6D00A; Fri, 14 Nov 2014 13:53:33 +0100 (CET) X-SENDER-IP: [213.113.165.61] X-LISTENER: [smtp.bredband.net] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AuYTAIT6ZVTVcaU9PGdsb2JhbABbgw0BAYEtgjZQhDe2DY8th12BIRcBAQEBAQEFAQEBATg7hCwPASMTAQ8YEQwCJgIvDAoaARKIRQG6SJZBAQsgGIEVj3WCfoFUBaAAhmOKWYgHPDCCSwEBAQ X-IPAS-Result: AuYTAIT6ZVTVcaU9PGdsb2JhbABbgw0BAYEtgjZQhDe2DY8th12BIRcBAQEBAQEFAQEBATg7hCwPASMTAQ8YEQwCJgIvDAoaARKIRQG6SJZBAQsgGIEVj3WCfoFUBaAAhmOKWYgHPDCCSwEBAQ X-IronPort-AV: E=Sophos;i="5.07,385,1413237600"; d="scan'208";a="816689530" Received: from c-3da571d5.710-7-64736c10.cust.bredbandsbolaget.se (HELO polaris) ([213.113.165.61]) by ipb5.telenor.se with SMTP; 14 Nov 2014 13:53:32 +0100 Received: by polaris (sSMTP sendmail emulation); Fri, 14 Nov 2014 13:53:34 +0100 From: Henrik Rydberg To: Peter Jones , Jean-Christophe Plagniol-Villard , Tomi Valkeinen Cc: Bjorn Helgaas , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Henrik Rydberg , =?UTF-8?q?Bruno=20Pr=C3=A9mont?= Subject: [PATCH] x86, ia64: Do not lose track of the EFI default VGA device Date: Fri, 14 Nov 2014 13:53:30 +0100 Message-Id: <1415969610-1469-1-git-send-email-rydberg@euromail.se> X-Mailer: git-send-email 2.1.3 MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since commit 20cde694027e ("x86, ia64: Move EFI_FB vga_default_device() initialization to pci_vga_fixup()") in the 3.17 merge window, the EFI framebuffer depends on the VGA arbitration layer. However, the configuration does not reflect this, which leads to a hard-to-find bug when FB_EFI is configured without VGA_ARB. Add a select clause to remedy this. Cc: Bruno Prémont Signed-off-by: Henrik Rydberg --- Hi Peter, I stumbled upon this bug from the 3.17 merge window when updating to Linus's 3.18 git head yesterday. The patch has been tested on two different EFI machines; one that needs the patch and one that does not. Thanks, Henrik drivers/video/fbdev/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index c7bf606..81b21bc 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -761,6 +761,7 @@ config FB_EFI select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VGA_ARB help This is the EFI frame buffer device driver. If the firmware on your platform is EFI 1.10 or UEFI 2.0, select Y to add support for