From patchwork Tue Aug 27 11:09:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 11118191 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D0D56112C for ; Wed, 28 Aug 2019 08:28:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3E4F82173E for ; Wed, 28 Aug 2019 08:28:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E4F82173E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18C6F89722; Wed, 28 Aug 2019 08:28:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10105.outbound.protection.outlook.com [40.107.1.105]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F07B894A7 for ; Tue, 27 Aug 2019 11:09:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LlVFuWg8UodMRa1zfCpjo3awEhcZbESYdq9rpPTtbKjdspm6g//MglKVK1Vk8cgJHGwD6I0/MZf+YQQBhE+cv1LTvoeK6XMm8w/R94qhy0C1JZ1V6MRii+je31uUmD8EzjNTd4Nu7LhewniXEudb5vH3ttUcZbFF0LTEzGZMYFwd+cgF6HktX1urAcesAc0lpBjJxgP5s7kXyaq4O8DmibiPOZUaXGW97NDm+pCtBtnrMuKzn5GSxSVHInDcF54XKlOmmNN7cGPDiR8xbQ9z3/wC1xKOrmOIzsCpmiKSgM/jwIygCA2lRlNsoyuq3pqNSx1C+zZq1IX53hyPLJeEgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HzYkXKffNLiNfCQH5tfbnjcUD+zFyx9WF2wEk9JCzMY=; b=SechQxCzML1Tg4Em23j43XKFjVglpkPu4NVwdOkH+E2IaMbeR++BV4JIGLTmazaYYEg4mKTHR7XoDTrAf/ExEGGMa6ynCTqzxN3P/9zHhLyA3jysu/Fayp7mxuhwqfNk7ABha73J+mC6qsxNCzfmblO7WBG+TC9AZNOvtFIC6XU6wqgERm6LEfs5Hq+k9z+zjaWgauiI2SYfz61fZBPc/gz+IOTDWkL8m7Dv3mPUFs/0f+vb+TCXExq8Dz+59wN60PNEV34814n9Z0eNckhhspt1Z7lvj1eO4PPLBSZh0AZbNBZ3PwpTDhAyGgGIeX6pQA3ueKeMPZaKZsUGB76KCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=axentia.se; dmarc=pass action=none header.from=axentia.se; dkim=pass header.d=axentia.se; arc=none Received: from DB3PR0202MB3434.eurprd02.prod.outlook.com (52.134.66.158) by DB3PR0202MB3420.eurprd02.prod.outlook.com (52.134.67.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 27 Aug 2019 11:09:16 +0000 Received: from DB3PR0202MB3434.eurprd02.prod.outlook.com ([fe80::a0df:d7d9:f95e:f3ea]) by DB3PR0202MB3434.eurprd02.prod.outlook.com ([fe80::a0df:d7d9:f95e:f3ea%3]) with mapi id 15.20.2178.023; Tue, 27 Aug 2019 11:09:16 +0000 From: Peter Rosin To: "linux-kernel@vger.kernel.org" Subject: [PATCH v3 1/3] fbdev: fix numbering of fbcon options Thread-Topic: [PATCH v3 1/3] fbdev: fix numbering of fbcon options Thread-Index: AQHVXMfd9MAF8GUPp0SqrWDsOYLJ5w== Date: Tue, 27 Aug 2019 11:09:16 +0000 Message-ID: <20190827110854.12574-2-peda@axentia.se> References: <20190827110854.12574-1-peda@axentia.se> In-Reply-To: <20190827110854.12574-1-peda@axentia.se> Accept-Language: en-US, sv-SE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.11.0 x-originating-ip: [213.112.138.100] x-clientproxiedby: HE1PR0802CA0012.eurprd08.prod.outlook.com (2603:10a6:3:bd::22) To DB3PR0202MB3434.eurprd02.prod.outlook.com (2603:10a6:8:5::30) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6f9b339b-b721-405d-dcf2-08d72adf001f x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(7021145)(8989299)(4534185)(7022145)(4603075)(4627221)(201702281549075)(8990200)(7048125)(7024125)(7027125)(7023125)(5600166)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:DB3PR0202MB3420; x-ms-traffictypediagnostic: DB3PR0202MB3420: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4941; x-forefront-prvs: 0142F22657 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(366004)(346002)(39830400003)(396003)(376002)(199004)(189003)(3846002)(50226002)(2906002)(81156014)(6436002)(81166006)(4326008)(8936002)(6116002)(36756003)(66446008)(186003)(26005)(53936002)(76176011)(256004)(5640700003)(99286004)(52116002)(6506007)(102836004)(25786009)(6512007)(14444005)(386003)(66476007)(66556008)(1076003)(8676002)(5660300002)(6486002)(86362001)(14454004)(305945005)(7736002)(446003)(316002)(66066001)(64756008)(66946007)(2351001)(508600001)(2501003)(71190400001)(476003)(71200400001)(6916009)(486006)(11346002)(2616005)(54906003); DIR:OUT; SFP:1102; SCL:1; SRVR:DB3PR0202MB3420; H:DB3PR0202MB3434.eurprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: YIrlV1vWmV4GiLQ/KUBZLtLlblCypktSzvmuyU4DNnj7MeLAOEvUjBBD+XZNIRjDbvHYdQ5/Hz+w9szb7xKlSWEKebmtydfswbcbuuE96SnM/RX5+vpjeZpHeAIg9GYieXbIejBnEyCwoesJfoi/MauMzwK9+ue1f1ziWHaBc3DYoAnv0A0X+6UFbrs/Ivsz8WDIU00UhCkBpGAs29lHx5j9YMETFY20R0l24ucBVGfwz/C9Q1GVyIgMToVBN4W/poJzaXJJDJ/U5nW54OTbVS0KA6oIax6hJQ7HyKsDsz8RKnGtxJ2ZLmIi45IzC+DwzQBqeMnPEbf1Jan6q2PjZfZOzkOM0f/JkbreOzzxOnl8yRxiHjQoI76kjHbDjNzH83lCj0BcydySKiqUlVQHgyjgdtHaVlqs2om6qYpxJXE= MIME-Version: 1.0 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-Network-Message-Id: 6f9b339b-b721-405d-dcf2-08d72adf001f X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2019 11:09:16.5915 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: mZ0+DqBVKcyojV+oZvP7jAJh1oKG+NiXqawjOVhMPZyGfhRQPIlasPaioMgGhv3Q X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0202MB3420 X-Mailman-Approved-At: Wed, 28 Aug 2019 08:28:09 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HzYkXKffNLiNfCQH5tfbnjcUD+zFyx9WF2wEk9JCzMY=; b=gPPkmLboCGOlVVNYI2ZgjnejbnKWA3orDO/rMtZV4MUrW4Qggfr4ZLDmROzcSxay5d8SDAp4I6yYD3DVhADNMNtWxWkAj41U62HPq3+dNdO+jcW+i+aE+HxTmw4E+oP2HcY8+r/zmZaRUmP+GHXo6rbMx+9OHzlKg4Nndq2HLQ8= X-Mailman-Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linux-fbdev@vger.kernel.org" , Jonathan Corbet , "linux-doc@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , Bartlomiej Zolnierkiewicz , Geert Uytterhoeven , Matthew Wilcox , Peter Rosin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Three shall be the number thou shalt count, and the number of the counting shall be three. Four shalt thou not count... One! Two! Five! Fixes: efb985f6b265 ("[PATCH] fbcon: Console Rotation - Add framebuffer console documentation") Signed-off-by: Peter Rosin --- Documentation/fb/fbcon.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/fb/fbcon.rst b/Documentation/fb/fbcon.rst index ebca41785abe..65ba40255137 100644 --- a/Documentation/fb/fbcon.rst +++ b/Documentation/fb/fbcon.rst @@ -127,7 +127,7 @@ C. Boot options is typically located on the same video card. Thus, the consoles that are controlled by the VGA console will be garbled. -4. fbcon=rotate: +5. fbcon=rotate: This option changes the orientation angle of the console display. The value 'n' accepts the following: @@ -152,21 +152,21 @@ C. Boot options Actually, the underlying fb driver is totally ignorant of console rotation. -5. fbcon=margin: +6. fbcon=margin: This option specifies the color of the margins. The margins are the leftover area at the right and the bottom of the screen that are not used by text. By default, this area will be black. The 'color' value is an integer number that depends on the framebuffer driver being used. -6. fbcon=nodefer +7. fbcon=nodefer If the kernel is compiled with deferred fbcon takeover support, normally the framebuffer contents, left in place by the firmware/bootloader, will be preserved until there actually is some text is output to the console. This option causes fbcon to bind immediately to the fbdev device. -7. fbcon=logo-pos: +8. fbcon=logo-pos: The only possible 'location' is 'center' (without quotes), and when given, the bootup logo is moved from the default top-left corner From patchwork Tue Aug 27 11:09:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 11118197 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BFC14112C for ; Wed, 28 Aug 2019 08:28:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A95952173E for ; Wed, 28 Aug 2019 08:28:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A95952173E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 83BCB89973; Wed, 28 Aug 2019 08:28:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130125.outbound.protection.outlook.com [40.107.13.125]) by gabe.freedesktop.org (Postfix) with ESMTPS id A387389A8C for ; Tue, 27 Aug 2019 11:09:27 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XfyamY94iHGd1cO+JMcEeK1F1gkRhpjaFzRioXavbMs7WEOFrJcJvS7RVr75yyvgSN9w8oaXmGMzEOjmoV3U97DzS/6TivRrC0QTUmsrjsGpNrWlv26bqUhtHOwr2wOzJhAEFE4t9amvfZDdoPyfLq3vMPpJU/ll/bEbSruDHnqkfgzUYrIXK8k4ZRhuZ7MbFESiLhYsAvDQQyoVHFuRTUCZLy2jyUf9X8nt2RHWyCzjohnZfXj3iwzuK5m1xnIMr5GFLwy733kucpsEICEu07+WHzfgVHbnDhtmm0+vU5ic7ATHXTpAL1Nj/f3D/Rln5Hl9P8HiM60FRFFu4eTp+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cRqjE0WZVuRCuSo2PfQxoEd4jTslFS6OgAsaH9Mtu1o=; b=Dx4n4RZKo44b8p/IfEMofBrpbGmhTNI9s0IvN8sNHeBW2+4Bt9YQbCWClN7m6y5Lo8Up9c2eV5rXS8h/pa4kOdRaUFBtfgQSC8jjN4Vn6P09zYGkPzOrttjzL1pPsw8EQcdRt13m0TVmnBkyxTOHhY7QUB0OnB/030mlYrcHcaQ8Gq0ZEKozlopeAy74Uwe1quAeXDuzP1OxpN7vHHxfVvgkCVQToVMguU8WQ3pxDPTTvek+rxMZW+174K/BFHY+Ya7yXlBUcFz4S3CMCuiXg8fjoA9TNyusDyLeZuHMLQSV7U6QrGWtLQlP3jAnEzVqKz/QrzldAnn9ChrPE0Nprw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=axentia.se; dmarc=pass action=none header.from=axentia.se; dkim=pass header.d=axentia.se; arc=none Received: from DB3PR0202MB3434.eurprd02.prod.outlook.com (52.134.66.158) by DB3PR0202MB3465.eurprd02.prod.outlook.com (52.134.65.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 27 Aug 2019 11:09:21 +0000 Received: from DB3PR0202MB3434.eurprd02.prod.outlook.com ([fe80::a0df:d7d9:f95e:f3ea]) by DB3PR0202MB3434.eurprd02.prod.outlook.com ([fe80::a0df:d7d9:f95e:f3ea%3]) with mapi id 15.20.2178.023; Tue, 27 Aug 2019 11:09:21 +0000 From: Peter Rosin To: "linux-kernel@vger.kernel.org" Subject: [PATCH v3 2/3] fbdev: fbmem: allow overriding the number of bootup logos Thread-Topic: [PATCH v3 2/3] fbdev: fbmem: allow overriding the number of bootup logos Thread-Index: AQHVXMfgYnRTlyUjn0+AfY7i/XbReA== Date: Tue, 27 Aug 2019 11:09:21 +0000 Message-ID: <20190827110854.12574-3-peda@axentia.se> References: <20190827110854.12574-1-peda@axentia.se> In-Reply-To: <20190827110854.12574-1-peda@axentia.se> Accept-Language: en-US, sv-SE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.11.0 x-originating-ip: [213.112.138.100] x-clientproxiedby: HE1PR0802CA0012.eurprd08.prod.outlook.com (2603:10a6:3:bd::22) To DB3PR0202MB3434.eurprd02.prod.outlook.com (2603:10a6:8:5::30) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2e726720-34f3-4045-da00-08d72adf0328 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(7021145)(8989299)(4534185)(7022145)(4603075)(4627221)(201702281549075)(8990200)(7048125)(7024125)(7027125)(7023125)(5600166)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:DB3PR0202MB3465; x-ms-traffictypediagnostic: DB3PR0202MB3465: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-forefront-prvs: 0142F22657 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39830400003)(366004)(376002)(346002)(396003)(136003)(189003)(199004)(508600001)(99286004)(186003)(25786009)(6436002)(53936002)(2351001)(5660300002)(26005)(7736002)(2501003)(256004)(6116002)(8936002)(305945005)(54906003)(1076003)(81166006)(81156014)(6916009)(5024004)(3846002)(8676002)(50226002)(386003)(6506007)(66066001)(66946007)(6512007)(52116002)(76176011)(102836004)(36756003)(446003)(486006)(11346002)(2616005)(6486002)(316002)(4326008)(71190400001)(2906002)(86362001)(14454004)(5640700003)(476003)(71200400001)(66476007)(66446008)(66556008)(64756008); DIR:OUT; SFP:1102; SCL:1; SRVR:DB3PR0202MB3465; H:DB3PR0202MB3434.eurprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: hf0xrqgkG/U54WB/5TT2us1wSpYiQi2RglkLY8S48bd7SvT3Vl/S47TR67VJQ+tXcVHbYqZBxDdxgMkuffCcPGcqHzPTqNYITxAVlp9m2rlnmUEFpltPH3aCqEVuSpfinIAEeNS2NjOmQThut0ySPUTfOjC84lpUI9io4KS+WFER3VrV2obWWURcU3N633QPErUJu5V4iPDAkyVJ7Qho6QKUR4bE00jS+YsTIJkdctLaM0U9ATzX1lIh4GehyRXq21iWU0HdmVEanQ9nGFTtJRLxHsJF7HPZ6WtfaHAz9x8Ef3jyt3zTY08iylYBhGty6wtBWenpVRfmND9dDaOQgYZfgJjPN7Jg4MLwuFfbZUTcMbuRUgh75nUJh+7odF0tJ7C6nD7+ubsIKdr3zA1gydjioCI54y+J6dcshy1t1Ic= MIME-Version: 1.0 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-Network-Message-Id: 2e726720-34f3-4045-da00-08d72adf0328 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2019 11:09:21.7115 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: y2xIZUjmmr3A9h7GrLQKyJ3wiWvW6S8oyqNIB6ChpGP1COPcxLUyQnG6mVQgw80W X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0202MB3465 X-Mailman-Approved-At: Wed, 28 Aug 2019 08:28:09 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cRqjE0WZVuRCuSo2PfQxoEd4jTslFS6OgAsaH9Mtu1o=; b=PFrPXl7Q/96EZP9vDnq84iRYJBC5H5Z7uCtx6yq0AQ8Shm+IW+ne2c4xSjJKn0R6aTskhZUsulZF9RD0kWnfr2Iw1kAowKs6bMSMEpEhI6EXzBkHgP+arzEm/mjYIqRsfCzhuAuRmGxwcF0pHPL8uZg6yWnfrK7mVRHAgA3/3Uc= X-Mailman-Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linux-fbdev@vger.kernel.org" , Jonathan Corbet , "linux-doc@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , Bartlomiej Zolnierkiewicz , Geert Uytterhoeven , Matthew Wilcox , Peter Rosin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Probably most useful if you want no logo at all, or if you only want one logo regardless of how many CPU cores you have. Signed-off-by: Peter Rosin --- Documentation/fb/fbcon.rst | 5 +++++ drivers/video/fbdev/core/fbcon.c | 7 +++++++ drivers/video/fbdev/core/fbmem.c | 12 +++++++++--- include/linux/fb.h | 1 + 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Documentation/fb/fbcon.rst b/Documentation/fb/fbcon.rst index 65ba40255137..e57a3d1d085a 100644 --- a/Documentation/fb/fbcon.rst +++ b/Documentation/fb/fbcon.rst @@ -174,6 +174,11 @@ C. Boot options displayed due to multiple CPUs, the collected line of logos is moved as a whole. +9. fbcon=logo-count: + + The value 'n' overrides the number of bootup logos. 0 disables the + logo, and -1 gives the default which is the number of online CPUs. + C. Attaching, Detaching and Unloading Before going on to how to attach, detach and unload the framebuffer console, an diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index c9235a2f42f8..bb6ae995c2e5 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -536,6 +536,13 @@ static int __init fb_console_setup(char *this_opt) fb_center_logo = true; continue; } + + if (!strncmp(options, "logo-count:", 11)) { + options += 11; + if (*options) + fb_logo_count = simple_strtol(options, &options, 0); + continue; + } } return 1; } diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 64dd732021d8..c7ddcb72025b 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -56,6 +56,8 @@ EXPORT_SYMBOL(num_registered_fb); bool fb_center_logo __read_mostly; EXPORT_SYMBOL(fb_center_logo); +int fb_logo_count __read_mostly = -1; + static struct fb_info *get_fb_info(unsigned int idx) { struct fb_info *fb_info; @@ -620,7 +622,7 @@ int fb_prepare_logo(struct fb_info *info, int rotate) memset(&fb_logo, 0, sizeof(struct logo_data)); if (info->flags & FBINFO_MISC_TILEBLITTING || - info->fbops->owner) + info->fbops->owner || !fb_logo_count) return 0; if (info->fix.visual == FB_VISUAL_DIRECTCOLOR) { @@ -686,10 +688,14 @@ int fb_prepare_logo(struct fb_info *info, int rotate) int fb_show_logo(struct fb_info *info, int rotate) { + unsigned int count; int y; - y = fb_show_logo_line(info, rotate, fb_logo.logo, 0, - num_online_cpus()); + if (!fb_logo_count) + return 0; + + count = fb_logo_count < 0 ? num_online_cpus() : fb_logo_count; + y = fb_show_logo_line(info, rotate, fb_logo.logo, 0, count); y = fb_show_extra_logos(info, y, rotate); return y; diff --git a/include/linux/fb.h b/include/linux/fb.h index 303771264644..e37f72b2efca 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -630,6 +630,7 @@ extern int fb_new_modelist(struct fb_info *info); extern struct fb_info *registered_fb[FB_MAX]; extern int num_registered_fb; extern bool fb_center_logo; +extern int fb_logo_count; extern struct class *fb_class; #define for_each_registered_fb(i) \ From patchwork Tue Aug 27 11:09:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 11118211 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB0C214D5 for ; Wed, 28 Aug 2019 08:29:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C451B2343D for ; Wed, 28 Aug 2019 08:29:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C451B2343D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64E6189CF7; Wed, 28 Aug 2019 08:29:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130125.outbound.protection.outlook.com [40.107.13.125]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9747989A8C for ; Tue, 27 Aug 2019 11:09:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MNodGOzrxlgZMqXBjUXDPimj6297jpCDIAAGQ3pmnDqW+AMp//Ja/HHEDb1HMZoqI1GzyQY9711y3PuDwMF3fxJWn+VVFIYPXaFEb++ktheePDkaA0JUc3YYFPf7DsFLlNqkFJ1FmgbzJp3U24ws8MV+g1zfCR8FLS01sIA4nu+LdVrprGlqzlUnFSZ/fi4nfJ17WgeeOese9UJOeZHW1L877Zui5oqwahyi+HEc2tCMT9kuCl7Q56HBSv+AS+gwsC4Y3QOqTW03QGBpQCDd4KAPu44/Cpm0ku5aHm1U1T1xaYPMHVDzA3SlsMOEp5O8d2ZGmgwOIs19vRc6OHpoxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=91VOH+vDNas5HY7lNAsbI7PTV7qG4iDbOpjyyXSQXfY=; b=H31bJCqLNvG4JJRSaJ+nYlvRD96bnFxW20DK68nfuJj4sEAJZQlR9DUgd2XciJE5crcJzX1w3E02ZKkL66ocC6/n40/uD2udBRmVWbk20djAwf3mGwWXwIG22IMs0K3uWfduaBtKT5oMvRE+PXpUah5vcnBFxrawF9jJMeeIj0R/GeUs3uMIB3EOKxW/i/nIjkxwAZx6PwsjXy0MyM5F7efxjD7Tuf6YQVbu5E9La42tWNCk8DRMltWceuZDWRBIqz83lgH1vp1OBZm+L4DEnc6ot7505L30z1iaRNHe/KyORhSUW4ZoC6wx2idxGCnn+/kkomErkr8LjpppmfEiew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=axentia.se; dmarc=pass action=none header.from=axentia.se; dkim=pass header.d=axentia.se; arc=none Received: from DB3PR0202MB3434.eurprd02.prod.outlook.com (52.134.66.158) by DB3PR0202MB3465.eurprd02.prod.outlook.com (52.134.65.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 27 Aug 2019 11:09:26 +0000 Received: from DB3PR0202MB3434.eurprd02.prod.outlook.com ([fe80::a0df:d7d9:f95e:f3ea]) by DB3PR0202MB3434.eurprd02.prod.outlook.com ([fe80::a0df:d7d9:f95e:f3ea%3]) with mapi id 15.20.2178.023; Tue, 27 Aug 2019 11:09:26 +0000 From: Peter Rosin To: "linux-kernel@vger.kernel.org" Subject: [PATCH v3 3/3] fbdev: fbmem: avoid exporting fb_center_logo Thread-Topic: [PATCH v3 3/3] fbdev: fbmem: avoid exporting fb_center_logo Thread-Index: AQHVXMfjb9HuvMXdNUO0R8iyHBP+3g== Date: Tue, 27 Aug 2019 11:09:26 +0000 Message-ID: <20190827110854.12574-4-peda@axentia.se> References: <20190827110854.12574-1-peda@axentia.se> In-Reply-To: <20190827110854.12574-1-peda@axentia.se> Accept-Language: en-US, sv-SE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.11.0 x-originating-ip: [213.112.138.100] x-clientproxiedby: HE1PR0802CA0012.eurprd08.prod.outlook.com (2603:10a6:3:bd::22) To DB3PR0202MB3434.eurprd02.prod.outlook.com (2603:10a6:8:5::30) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d7bd2115-667c-4dbe-1add-08d72adf05ce x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(7021145)(8989299)(4534185)(7022145)(4603075)(4627221)(201702281549075)(8990200)(7048125)(7024125)(7027125)(7023125)(5600166)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:DB3PR0202MB3465; x-ms-traffictypediagnostic: DB3PR0202MB3465: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1775; x-forefront-prvs: 0142F22657 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39830400003)(366004)(376002)(346002)(396003)(136003)(189003)(199004)(508600001)(99286004)(186003)(25786009)(6436002)(53936002)(2351001)(5660300002)(26005)(7736002)(2501003)(256004)(6116002)(8936002)(305945005)(54906003)(4744005)(1076003)(81166006)(81156014)(6916009)(3846002)(14444005)(8676002)(50226002)(386003)(6506007)(66066001)(66946007)(6512007)(52116002)(76176011)(102836004)(36756003)(446003)(486006)(11346002)(2616005)(6486002)(316002)(4326008)(71190400001)(2906002)(86362001)(14454004)(5640700003)(476003)(71200400001)(66476007)(66446008)(66556008)(64756008); DIR:OUT; SFP:1102; SCL:1; SRVR:DB3PR0202MB3465; H:DB3PR0202MB3434.eurprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Jj8d+sWO9ZcXy2Ngr7R2Ejwz3pp0jADgPHJuhRcUoc1SLRyiAw7wWmwlZajtDF0NA2cbNHbUzk6UjCXHJXDVksojOqVJ7Mioxce+7TRYdQdd6+8Job/0kVTDO6fFPi/ovu06RMlCrpMypIxvNz0HgpZHzJ/HmhuNnNLl1H7LCZcPD8f4AX9dUBqOFLAgm7AwDW4jDPplfFPZS7tntMHm4z1VoOSbikNGJ82SKR+OhZNEoCG6gYTgygZxgUgZLTwoYxw8hx6qGq7dINFQt4GJD8riv8voBuSAJTQyuShPddXdCvZtbc3j8fjdXExOtuF3QomPcIO/HgtF2oYacOfKLaCVZ8t83gX6+KEnf6e4BYwFhF2JuhVL6IXZtQo7JIlpdvudDe/bkV9tWlcAdaT3T2fAXIyUTDyjSJeBSpoqbgk= MIME-Version: 1.0 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-Network-Message-Id: d7bd2115-667c-4dbe-1add-08d72adf05ce X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2019 11:09:26.1960 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: uy8s3wiwEGlN7NOvh8VgJgSsQUoDC+G2pmMplqYu6nAxjjd/83hQHLNP3Xvvvqgw X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0202MB3465 X-Mailman-Approved-At: Wed, 28 Aug 2019 08:28:09 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=91VOH+vDNas5HY7lNAsbI7PTV7qG4iDbOpjyyXSQXfY=; b=bn4m/dWuYJP3NXd5ipuFtGM0ZooAFnGVSRD2GhOMFlqU60o6YQzeX7p8YOl62DETyayQVMgHDdM5dmRhwnR6OsyYcvc5kmzaMVECKzMeUj55Lk/8gVYO0Pb8siaLeywz/dkmrclf5ozLX/EX4ABit9Trg4uKc70ROdXK82f/vpI= X-Mailman-Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linux-fbdev@vger.kernel.org" , Jonathan Corbet , "linux-doc@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , Bartlomiej Zolnierkiewicz , Geert Uytterhoeven , Matthew Wilcox , Peter Rosin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The variable is only ever used from fbcon.c which is linked into the same module. Therefore, the export is not needed. Signed-off-by: Peter Rosin --- drivers/video/fbdev/core/fbmem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index c7ddcb72025b..d45e59ac351b 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -54,7 +54,6 @@ int num_registered_fb __read_mostly; EXPORT_SYMBOL(num_registered_fb); bool fb_center_logo __read_mostly; -EXPORT_SYMBOL(fb_center_logo); int fb_logo_count __read_mostly = -1;