From mboxrd@z Thu Jan 1 00:00:00 1970 From: 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> References: <1390486503-1504-1-git-send-email-dh.herrmann@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) by gabe.freedesktop.org (Postfix) with ESMTP id 27B6CFBBF8 for ; Thu, 23 Jan 2014 06:16:11 -0800 (PST) Received: by mail-we0-f175.google.com with SMTP id p61so1224447wes.34 for ; Thu, 23 Jan 2014 06:16:11 -0800 (PST) In-Reply-To: <1390486503-1504-1-git-send-email-dh.herrmann@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org, Daniel Vetter , linux-kernel@vger.kernel.org, Tomi Valkeinen , Ingo Molnar List-Id: dri-devel@lists.freedesktop.org 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, -- 1.8.5.3