From patchwork Mon Aug 26 19:58:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 11116235 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 B64FC112C for ; Tue, 27 Aug 2019 07:29:36 +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 99A3120828 for ; Tue, 27 Aug 2019 07:29:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99A3120828 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 2AC37897C5; Tue, 27 Aug 2019 07:29:20 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0716.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::716]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF6586E2F3 for ; Mon, 26 Aug 2019 19:59:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RRzljwf6/beSMvsGWgUin0Mr0azW4md7lMVeJDYuE9pC6nf5U8tzMMV0RBoD1LENHcpgewjpF0VYl99SQBBxKpgLwSgb0HPBjFptdGOHBS+2Iy9908pbACdr4rZUwC5F8qzhlmbqMBud5FcaocF+hR/e/pf+FbVrK2H5C9y+NkbKBA5XLiJYLQRI/K2UhB3suUhpqMlYMeWuxEYsLOSLbPNs6IpEmMdFoXwIg4entrRYIN4JTr3RKl3TdVqwWp5VwUGCpG9X8nUeCCEIJWI11wIi8S+Orr1Hw/bXS/Z95hIskEjdw/nFzedd/5Bh6BaG2WD4fg96EzfqUcy3qSZubg== 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=r48C9G2I6doSYZhilQaVgfdxXd9WEOXf/GFjchabS4M=; b=T4cM22YhXwPU9O7U5ZwsnFrsftP3LHP39QzjiduOrq6ZK+t//bw8tjuOn9TSuAtj4bXExCpDancr0O+5ZY0eHsUzqOJ9l12wRoKE8cwYlK86Ye6c1ZUib1Rc45TSEWAXajXcMZD8HUleosCJv9AOGj8DwSIZDH3BqH6EssqN6d/9sLAlrtWI6bVNr3UkiSK8k2MYuSx5kheUWjEASxeFkscKdnuk6xMKDASXqPNDHZ7yPwJ31MB2Mkc4eCr/MXkNQjiN9dQilAGh/wBpw0JDKspIEFRSKOI/IT6GJtXFtQ8El2gQb3GHkqqxxbtiWFhyBaCiS7QE1qvU9EBovmS/0Q== 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 DB3PR0202MB3340.eurprd02.prod.outlook.com (52.134.67.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.18; Mon, 26 Aug 2019 19:58:58 +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; Mon, 26 Aug 2019 19:58:58 +0000 From: Peter Rosin To: "linux-kernel@vger.kernel.org" Subject: [PATCH v2 2/3] fbdev: fbmem: allow overriding the number of bootup logos Thread-Topic: [PATCH v2 2/3] fbdev: fbmem: allow overriding the number of bootup logos Thread-Index: AQHVXEiydN7Y70k3jUSZvl39hK1AWQ== Date: Mon, 26 Aug 2019 19:58:58 +0000 Message-ID: <20190826195740.29415-3-peda@axentia.se> References: <20190826195740.29415-1-peda@axentia.se> In-Reply-To: <20190826195740.29415-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: HE1PR0901CA0054.eurprd09.prod.outlook.com (2603:10a6:3:45::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: 365c794a-7de3-43a0-a10a-08d72a5fd542 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:DB3PR0202MB3340; x-ms-traffictypediagnostic: DB3PR0202MB3340: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4714; x-forefront-prvs: 01415BB535 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(346002)(366004)(396003)(39830400003)(136003)(189003)(199004)(8936002)(256004)(316002)(54906003)(26005)(476003)(2616005)(99286004)(102836004)(76176011)(386003)(6506007)(66066001)(52116002)(5640700003)(508600001)(186003)(6436002)(486006)(66946007)(66476007)(66446008)(36756003)(64756008)(66556008)(2351001)(1076003)(6486002)(6916009)(2906002)(50226002)(86362001)(71200400001)(71190400001)(2501003)(53936002)(6512007)(4326008)(25786009)(11346002)(446003)(3846002)(6116002)(305945005)(14454004)(81156014)(81166006)(5024004)(14444005)(5660300002)(7736002)(8676002); DIR:OUT; SFP:1102; SCL:1; SRVR:DB3PR0202MB3340; 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: l6jgyRjVcYmbXaWS06x6L2ziSOqjiebJWE0Y/JserifjhN5BCa/xxlEv9DOtPz0aL7QBJxmoAvH/a/9hYo1p6ekmRQrWN2XPKKGffhrZYP4RcfjfZqteYWhKRxwxMUfpiKOB/iE1ZiB2s7i2dXo88or7Z7VqCkhNs7n2oWC1YsexYearZA6rmqsHFGgcA3w9PvtLZ7woEwO0jeVLs5+vjMjFK51oBY6ZQsdGaL4NjHJ1fz1+igS3jFOryCiS4udf3D37azgkHbAxCYUznf5rUlA0gaA4G/99LiBl05lZ1jcUQnsuDG1AwVPQLKVGe0F2IBwHpkTU0/yCHLlp5LMQEj4TKFkUGpkvb8ZVb0I5q7hDXMNl95LPVnWU8u0gQHw/Tc0e8E+33F/NSSEKK1cfF5gcDrdv8pO0pX6cyM3X0Dg= MIME-Version: 1.0 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-Network-Message-Id: 365c794a-7de3-43a0-a10a-08d72a5fd542 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Aug 2019 19:58:58.6526 (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: Ffz/OaaPPIlQqPQFeossdHYIMwCeTNjOLUNmf6dQeWhOQyQZAD5T9SuWwE7uJOno X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0202MB3340 X-Mailman-Approved-At: Tue, 27 Aug 2019 07:29:19 +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=r48C9G2I6doSYZhilQaVgfdxXd9WEOXf/GFjchabS4M=; b=cK4obFu0JaYJvAXAxs0++rP4HhqiIaDmrUu38U8CQsVVZ7eJVcE4s97Zueb/e/K4QFA2E3jJTHcvU0OodROg/CRwgLNO1PJjHIIK9L+pRKrpKv98upto1iAwkxskijS9fVsYNhxw+nE8GM1+F/qEV/84wHC+BYRMJi14eEuu1cQ= 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 , Matthew Wilcox , Peter Rosin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Probably most useful 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 | 4 +++- include/linux/fb.h | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Documentation/fb/fbcon.rst b/Documentation/fb/fbcon.rst index 65ba40255137..9f0b399d8d4e 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. Zero 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..be4bc5540aad 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_strtoul(options, &options, 0); + continue; + } } return 1; } diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 64dd732021d8..a7d8022db516 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); +unsigned int fb_logo_count __read_mostly; + static struct fb_info *get_fb_info(unsigned int idx) { struct fb_info *fb_info; @@ -689,7 +691,7 @@ int fb_show_logo(struct fb_info *info, int rotate) int y; y = fb_show_logo_line(info, rotate, fb_logo.logo, 0, - num_online_cpus()); + fb_logo_count ?: num_online_cpus()); y = fb_show_extra_logos(info, y, rotate); return y; diff --git a/include/linux/fb.h b/include/linux/fb.h index 303771264644..5f2b05406262 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 unsigned int fb_logo_count; extern struct class *fb_class; #define for_each_registered_fb(i) \