From patchwork Thu Jan 23 14:15:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 3529111 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 D5F5D9F391 for ; Thu, 23 Jan 2014 14:16:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCC2220179 for ; Thu, 23 Jan 2014 14:16:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFEB420108 for ; Thu, 23 Jan 2014 14:16:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932160AbaAWOQO (ORCPT ); Thu, 23 Jan 2014 09:16:14 -0500 Received: from mail-we0-f173.google.com ([74.125.82.173]:51082 "EHLO mail-we0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932244AbaAWOQM (ORCPT ); Thu, 23 Jan 2014 09:16:12 -0500 Received: by mail-we0-f173.google.com with SMTP id t60so1205311wes.4 for ; Thu, 23 Jan 2014 06:16:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=T0/FW6h/V/q/32392u5l1KqwmdkfwtCNZ3NeblP8DYg=; b=Hjtk0cqFEssy8yushFmDviYKJ2Lahz1v4j/k9tBeDzHz28pVozr9zfy7m0Kzql8fEa hGSmvpL5hpKpLgNLndu/yx7h/8s+S3IbxRdcZptKl0uNAlTm4yQ0Wv8K2ASqlFyeqc0c onLAufgXEQOAPoeLKiaLLeZpSSnzIA6Sqs3Qg9At0onMkp7MwKcIQGOZ34NyGhMaRJp/ v50PX00tIMDCtKZyVMflJ1M8aJ88p/BFKDg7QFvxCCpxHezyZg/QL30IOk+Fkmf0rIW3 ZObCm5NtMohAEoRgehbJWHWHnKcBMPYRdV5z+XWho5CRbbklnDqzyfH8seTckM74edCy lMwg== X-Received: by 10.180.207.15 with SMTP id ls15mr7303177wic.50.1390486571339; Thu, 23 Jan 2014 06:16:11 -0800 (PST) Received: from david-ub.localdomain (stgt-5f71be19.pool.mediaWays.net. [95.113.190.25]) by mx.google.com with ESMTPSA id ci4sm22667871wjc.21.2014.01.23.06.16.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Jan 2014 06:16:10 -0800 (PST) From: David Herrmann To: dri-devel@lists.freedesktop.org Cc: Ingo Molnar , linux-fbdev@vger.kernel.org, Dave Airlie , Daniel Vetter , Tomi Valkeinen , linux-kernel@vger.kernel.org, Tom Gundersen , David Herrmann Subject: [PATCH 11/11] x86/sysfb: allow sysfb+simpledrm combination Date: Thu, 23 Jan 2014 15:15:03 +0100 Message-Id: <1390486503-1504-12-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1390486503-1504-1-git-send-email-dh.herrmann@gmail.com> References: <1390486503-1504-1-git-send-email-dh.herrmann@gmail.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 We used to protect X86_SYSFB by depending on FB_SIMPLE so users don't accidentally end up without a kernel console. Now that DRM_SIMPLEDRM also provides a simple-framebuffer driver, we can whitelist this driver, too. --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 93df439..f3eae6a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2299,7 +2299,7 @@ source "drivers/rapidio/Kconfig" config X86_SYSFB bool "Mark VGA/VBE/EFI FB as generic system framebuffer" - depends on FB_SIMPLE + depends on FB_SIMPLE || DRM_SIMPLEDRM select SYSFB help Firmwares often provide initial graphics framebuffers so the BIOS,