From patchwork Thu Dec 19 13:38:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 3380911 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 8D1839F384 for ; Thu, 19 Dec 2013 13:39:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80D9F20639 for ; Thu, 19 Dec 2013 13:39:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2DC520638 for ; Thu, 19 Dec 2013 13:39:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751525Ab3LSNjW (ORCPT ); Thu, 19 Dec 2013 08:39:22 -0500 Received: from mail-ee0-f54.google.com ([74.125.83.54]:59827 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751332Ab3LSNjU (ORCPT ); Thu, 19 Dec 2013 08:39:20 -0500 Received: by mail-ee0-f54.google.com with SMTP id e51so408024eek.27 for ; Thu, 19 Dec 2013 05:39:18 -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; bh=/v8y8rjmfN4s+ADL10iExyNwu1BC+OT85TqYTEOOALg=; b=xgZxVOjF8L0K8qUktEdOQQVkHRJ/5kMYAqWvC2cKZ7R3F+8XL7S8kfxQpVOADVcX7E ObQdbTwFraftTY9Pf0kA+687kj2trh/HbG3wQpCaOGLN5F6W7x2vdmKIU9JG91aX4b+R yu6E9ceJYFTnihHi7EeON9rkho9lyXKGs16a5/IZQjOl4NNEKsOojDdLsCsKMN+tiWK3 mcQlnyOHmRQbXoC4s2U3gaP8vpHtIa5Hx922/Epw1lvt2GJkLhCrfdo7UduMdzxVI4aF MXfe0zRVf0odSW2lWhhXqm9CQhxLIGSEbVgGi0fVrbtcjKp6yh9yEAT7IsOmMlqbeOzl roDA== X-Received: by 10.14.108.134 with SMTP id q6mr706637eeg.96.1387460358615; Thu, 19 Dec 2013 05:39:18 -0800 (PST) Received: from david-ub.localdomain (stgt-5f719d74.pool.mediaWays.net. [95.113.157.116]) by mx.google.com with ESMTPSA id m1sm9504593eeg.0.2013.12.19.05.39.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Dec 2013 05:39:16 -0800 (PST) From: David Herrmann To: linux-kernel@vger.kernel.org Cc: Takashi Iwai , Ingo Molnar , , , David Herrmann , Subject: [PATCH] x86: sysfb: fool-proof CONFIG_X86_SYSFB Date: Thu, 19 Dec 2013 14:38:50 +0100 Message-Id: <1387460330-13989-1-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.8.5.1 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=unavailable 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 Turns out, people do not read help-texts of new config-options and enable them nonetheless. So several reports came in with X86_SYSFB=y and FB_SIMPLE=n, which in almost all situations prevents firmware-fbs from being probed. X86_SYSFB clearly states that it turns legacy vesa/efi framebuffers into a format compatible to simplefb (and does nothing else..). So to avoid further complaints about missing gfx-support during boot, simply depend on FB_SIMPLE now. As FB_SIMPLE is disabled by default and usually only enabled on selected ARM architectures, x86 users should thus never see the X86_SYSFB config-option. And if they do, everything is fine as simplefb will be available. Note that most of the sysfb code is enabled independently of X86_SYSFB. The config option only selects a compatibility mode for simplefb. It was introduced to ease the transition to SimpleDRM and disabling fbdev. As this is still ongoing, there's no need for non-developers to care for X86_SYSFB so just change the help-text recommendation to "n". Cc: # 3.11+ Signed-off-by: David Herrmann --- arch/x86/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e903c71..9317ede 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2298,6 +2298,7 @@ source "drivers/rapidio/Kconfig" config X86_SYSFB bool "Mark VGA/VBE/EFI FB as generic system framebuffer" + depends on (FB_SIMPLE = y) help Firmwares often provide initial graphics framebuffers so the BIOS, bootloader or kernel can show basic video-output during boot for @@ -2320,7 +2321,7 @@ config X86_SYSFB and others enabled as fallback if a system framebuffer is incompatible with simplefb. - If unsure, say Y. + If unsure, say N. endmenu