From patchwork Mon Jan 7 10:35: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: 10750273 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E2A8013BF for ; Mon, 7 Jan 2019 10:36:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D242A28A3A for ; Mon, 7 Jan 2019 10:36:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5BC428B05; Mon, 7 Jan 2019 10:36:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95BCF28A3A for ; Mon, 7 Jan 2019 10:36:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726521AbfAGKgO (ORCPT ); Mon, 7 Jan 2019 05:36:14 -0500 Received: from mail-eopbgr40133.outbound.protection.outlook.com ([40.107.4.133]:35008 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726454AbfAGKgO (ORCPT ); Mon, 7 Jan 2019 05:36:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aVK3m6Br3c0+021GmILFhN4tWWRhNutCr/6kqWEex2g=; b=TcDLjptOJ1KEAhwH1pSn7O9C0OTUPk/XpzaRwO+CpEPieou9Aq3tB1GQeT1eOaHPedSZ4BkL3t+PYqYTfVp2qD507S7r0SXL8kxocnMUuQL5AP2F8ApzQ3PRxOcSYYUHWzU29Zs75dZGExL9KFy6mV7OAqwyyUpI+8tiG7n8Ipc= Received: from AM6PR02MB4470.eurprd02.prod.outlook.com (20.177.191.218) by AM6PR02MB4691.eurprd02.prod.outlook.com (20.177.189.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.6; Mon, 7 Jan 2019 10:35:58 +0000 Received: from AM6PR02MB4470.eurprd02.prod.outlook.com ([fe80::e5f3:a239:2ec4:4453]) by AM6PR02MB4470.eurprd02.prod.outlook.com ([fe80::e5f3:a239:2ec4:4453%6]) with mapi id 15.20.1495.011; Mon, 7 Jan 2019 10:35:58 +0000 From: Peter Rosin To: Bartlomiej Zolnierkiewicz CC: Geert Uytterhoeven , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "linux-fbdev@vger.kernel.org" , Jonathan Corbet , Linux Documentation List Subject: [PATCH v2] fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd, line option Thread-Topic: [PATCH v2] fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd, line option Thread-Index: AQHUpnTHQ6U4m/3NmkW8jtAGonq0AQ== Date: Mon, 7 Jan 2019 10:35:58 +0000 Message-ID: <6a9be31e-0bb4-d477-99e6-6cac3cd5087f@axentia.se> References: <20181126215725.2548-1-peda@axentia.se> <20181126215725.2548-3-peda@axentia.se> <37be75aa-7a63-a937-6de7-777a31af741b@axentia.se> <662db203-ae18-4a11-7b10-3d7d480f6f37@axentia.se> In-Reply-To: Accept-Language: en-US, sv-SE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.3.3 x-originating-ip: [85.226.244.23] x-clientproxiedby: HE1PR0402CA0035.eurprd04.prod.outlook.com (2603:10a6:7:7c::24) To AM6PR02MB4470.eurprd02.prod.outlook.com (2603:10a6:20b:60::26) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;AM6PR02MB4691;6:tKG79VbQYCaFcs82MSwO6i49Ev4IMzgwRgYWj5vw3eh5ptQLCMpwQ5AdmUSRv0hxszv0zAkGoWxHNWxSvSXZlfvOOAdJRZdTtqWCmfN26wpVmFe08rn/H9i36tEuRpDIN5Zw/+GU+UQhAhi4Y6Aw74zsUoRZLhLOb8FlnTEfal0oyp/tmDgcw0RWgpUOsNQ2ehAwGLtZU4JxDlbleXtRyA4fXAiuEHjQX9H9MSJc7yNiP+XG7y9HBW3vnKskYekCQVQwUC7R5TlTD7r6zTIl0sgJrUMDOfkWbCjhqWjRJOSf/4qz2yDfJiuo1EAk15B7SGLEQ86e5s/MPJsmbtixlrio+igz4S8NWZcd2q8tn1RF7gyHj8nTI3hrsVoee1G5aU06E9h672QOAzYz9+vE3Zc391xMHLaYpNYGrHY49h8Jib1MMWnZ2gpbfCduhfubemwR3a/TV0bop0O8uNGc6w==;5:THhLTVfTwxSnyW4PrjzYXRtgZ6vrGTMX/AM4JCHcp6ecILdhhZLIVK154OkL0FjgHD7Vz3cHY2ifcngE6k32mamBVMK0kB8B14bawKvtqkExGrPwLeP1J1j4wT1ByVJ2096ioFGMoCBcQO/OJqKTCqU7VSnrTjc4cEWXlOjl5GFzIfDtcN0OXGmeT+HXzV1Mj9oQ0p79OULySNxmCjAm9Q==;7:175U/cQdqYVMWYovp6c8tIUUvhAinfUUC35VzEynIhz0zGaidvv9yzZ4eo2KZcKz8tMykZO560QlZ0C//UKQ7mrSGyFV/FPiEQhVCVNe2u1hpf4mYfslLrsYftOoQ/kTth46K+amZ2cZlYY06lIdGg== x-ms-office365-filtering-correlation-id: 7f72743a-b95b-4653-f0ad-08d6748be964 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(7021145)(8989299)(4534185)(7022145)(4603075)(4627221)(201702281549075)(8990200)(7048125)(7024125)(7027125)(7023125)(5600109)(711020)(2017052603328)(7153060)(7193020);SRVR:AM6PR02MB4691; x-ms-traffictypediagnostic: AM6PR02MB4691: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(3231475)(944501520)(52105112)(93006095)(93001095)(10201501046)(3002001)(6041310)(20161123558120)(2016111802025)(20161123562045)(20161123560045)(20161123564045)(6043046)(201708071742011)(7699051)(76991095);SRVR:AM6PR02MB4691;BCL:0;PCL:0;RULEID:;SRVR:AM6PR02MB4691; x-forefront-prvs: 0910AAF391 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(376002)(136003)(396003)(346002)(39830400003)(189003)(199004)(25786009)(99286004)(86362001)(575784001)(4326008)(508600001)(68736007)(31696002)(97736004)(316002)(54906003)(58126008)(26005)(5660300001)(106356001)(65826007)(386003)(6506007)(105586002)(71200400001)(6916009)(102836004)(186003)(446003)(52116002)(2616005)(476003)(93886005)(11346002)(31686004)(53546011)(76176011)(305945005)(36756003)(486006)(65806001)(66066001)(65956001)(71190400001)(74482002)(64126003)(6486002)(2906002)(81156014)(8676002)(81166006)(7736002)(256004)(5024004)(14444005)(14454004)(3846002)(53936002)(8936002)(6512007)(6436002)(6116002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM6PR02MB4691;H:AM6PR02MB4470.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: ntYhMUIkSg4HKqXWnE5BiFcbDErN6rmXEYFJpYFz1a8XOgLCMJvSaq3+vTr+4UzyUZ8sUuGo4KFD2nO9wFgFlYZj1HTntd4dY38E1tmcBhJ90gyxGekTGyoQU0Ng4bgOUT6cmfru0dza9pZWW6eutudheWvNNjozS4yrhufoLY3JCLw4G3RAGCFDHLS+kZg4A43xZkW6uxNXqx9XfG5jZ79j2Jm5jucHLxlM5dALN3qxOBDSf+vc2AfO8hWc/tF/8N9hOEj1wK2hirhdoGoDrf8q0HtlSOyjpDmWZTeUhX5LHKVqckyzs8t/l9VdbzON spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <0DAB02715347834C8F79B1E99BFC3C99@eurprd02.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-Network-Message-Id: 7f72743a-b95b-4653-f0ad-08d6748be964 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Jan 2019 10:35:57.9443 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR02MB4691 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 2019-01-07 10:11, Geert Uytterhoeven wrote: > Hi Peter, > > On Mon, Jan 7, 2019 at 10:03 AM Peter Rosin wrote: >> On 2019-01-07 09:59, Peter Rosin wrote: >>> On 2019-01-07 09:40, Geert Uytterhoeven wrote: >>>> On Mon, Jan 7, 2019 at 9:26 AM Peter Rosin wrote: >>>>> On 2019-01-06 10:33, Geert Uytterhoeven wrote: >>>>>> On Mon, Nov 26, 2018 at 10:59 PM Peter Rosin wrote: >>>>>>> If there are extra logos (CONFIG_FB_LOGO_EXTRA) the heights of these >>>>>>> extra logos are not considered when centering the first logo vertically. >>>>>>> >>>>>>> Signed-off-by: Peter Rosin >>>>>> >>>>>>> --- a/drivers/video/logo/Kconfig >>>>>>> +++ b/drivers/video/logo/Kconfig >>>>>>> @@ -10,6 +10,15 @@ menuconfig LOGO >>>>>>> >>>>>>> if LOGO >>>>>>> >>>>>>> +config FB_LOGO_CENTER >>>>>>> + bool "Center the logo" >>>>>>> + depends on FB=y >>>>>>> + help >>>>>>> + When this option is selected, the bootup logo is centered both >>>>>>> + horizontally and vertically. If more than one logo is displayed >>>>>>> + due to multiple CPUs, the collected line of logos is centered >>>>>>> + as a whole. >>>>>>> + >>>>>> >>>>>> Isn't a kernel command line option more suitable to configure the position >>>>>> of the logo? >>>>> >>>>> That didn't occur to me previously, but it does make sense now that you >>>>> mention it. This is on top of v5.0-rc1, and if applied before v5.0 we >>>>> can avoid possible regressions for folks who might start to rely on >>>>> CONFIG_FB_LOGO_CENTER if v5.0 is released w/o this. >>>>> >>>>> Cheers, >>>>> Peter >>>>> >>>>> From de7353ab519ba9b5c9ea3f62d607bb8e94b687cc Mon Sep 17 00:00:00 2001 >>>>> From: Peter Rosin >>>>> Cc: Bartlomiej Zolnierkiewicz >>>>> Cc: Jonathan Corbet >>>>> Cc: Peter Rosin >>>>> Cc: dri-devel@lists.freedesktop.org >>>>> Cc: linux-fbdev@vger.kernel.org >>>>> Cc: linux-doc@vger.kernel.org >>>>> To: linux-kernel@vger.kernel.org >>>>> Date: Mon, 7 Jan 2019 08:35:26 +0100 >>>>> Subject: [PATCH] fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line >>>>> option >>>>> >>>>> A command line option is much more flexible than a config option and >>>>> the supporting code is small. Gets rid of #ifdefs in the code too... >>>>> >>>>> Suggested-by: Geert Uytterhoeven >>>>> Signed-off-by: Peter Rosin >>>> >>>> Thanks for your patch! >>>> >>>>> --- a/Documentation/fb/fbcon.txt >>>>> +++ b/Documentation/fb/fbcon.txt >>>>> @@ -163,6 +163,12 @@ C. Boot options >>>>> 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=center-logo >>>>> + >>>>> + When this option is selected, the bootup logo is centered both >>>>> + horizontally and vertically. If more than one logo is displayed due to >>>>> + multiple CPUs, the collected line of logos is centered as a whole. >>>>> + >>>> >>>> What about making this more generic, than an option specific for centering? >>>> Else people want fbcon=left-logo or fbcon=right-logo soon? >>>> >>>> fbcon=logo-pos: >>>> >>>> With being "center", "left", "top", "right", "bottom", and combinations >>>> like "top,center"? Or is that complicating stuff too much? >>> >>> I'm not too keen on implementing all that when I have zero use for it. I can >>> however rename the trigger for the existing fb_center_logo bool to >>> >>> fbcon=logo-pos:center >>> >>> and add a check for "top,left" to reset the bool to false. Then the other >>> variants can be added later by whomever and when needed. >>> >>> Is that good enough? >> >> Ouch, I just realized that using a comma is a no-go, as that is already >> separating fbcon suboptions, so I suggest top-left instead. > > Sure, sounds fine to me. I just want to avoid having a parameter system > that complicates future extension. > I think you can drop the check for top-left, as the bool defaults to false. Right. So, here's an update... Again, it would probably be best if this went in before 5.0 is released. Changes since v1: - rename from fbcon=center-logo option to fbcon=logo-pos:center (and adjust the help text accordingly). Cheers, Peter From ebfb2feb7ea4298ac9c222e6ea6f9c9a92452084 Mon Sep 17 00:00:00 2001 From: Peter Rosin Cc: Bartlomiej Zolnierkiewicz Cc: Jonathan Corbet Cc: Peter Rosin Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Cc: linux-doc@vger.kernel.org To: linux-kernel@vger.kernel.org Date: Mon, 7 Jan 2019 08:35:26 +0100 Subject: [PATCH v2] fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line option A command line option is much more flexible than a config option and the supporting code is small. Gets rid of #ifdefs in the code too... Suggested-by: Geert Uytterhoeven Signed-off-by: Peter Rosin --- Documentation/fb/fbcon.txt | 8 ++++++++ drivers/video/fbdev/core/fbcon.c | 7 +++++++ drivers/video/fbdev/core/fbmem.c | 19 ++++++++++--------- drivers/video/logo/Kconfig | 9 --------- include/linux/fb.h | 1 + 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt index 62af30511a95..60a5ec04e8f0 100644 --- a/Documentation/fb/fbcon.txt +++ b/Documentation/fb/fbcon.txt @@ -163,6 +163,14 @@ C. Boot options 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: + + The only possible 'location' is 'center' (without quotes), and when + given, the bootup logo is moved from the default top-left corner + location to the center of the framebuffer. If more than one logo is + displayed due to multiple CPUs, the collected line of logos is moved + as a whole. + 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 8976190b6c1f..bfa1360ec750 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -510,6 +510,13 @@ static int __init fb_console_setup(char *this_opt) continue; } #endif + + if (!strncmp(options, "logo-pos:", 9)) { + options += 9; + if (!strcmp(options, "center")) + fb_center_logo = true; + continue; + } } return 1; } diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 558ed2ed3124..cb43a2258c51 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -53,6 +53,9 @@ EXPORT_SYMBOL(registered_fb); int num_registered_fb __read_mostly; EXPORT_SYMBOL(num_registered_fb); +bool fb_center_logo __read_mostly; +EXPORT_SYMBOL(fb_center_logo); + static struct fb_info *get_fb_info(unsigned int idx) { struct fb_info *fb_info; @@ -506,8 +509,7 @@ static int fb_show_logo_line(struct fb_info *info, int rotate, fb_set_logo(info, logo, logo_new, fb_logo.depth); } -#ifdef CONFIG_FB_LOGO_CENTER - { + if (fb_center_logo) { int xres = info->var.xres; int yres = info->var.yres; @@ -520,11 +522,11 @@ static int fb_show_logo_line(struct fb_info *info, int rotate, --n; image.dx = (xres - n * (logo->width + 8) - 8) / 2; image.dy = y ?: (yres - logo->height) / 2; + } else { + image.dx = 0; + image.dy = y; } -#else - image.dx = 0; - image.dy = y; -#endif + image.width = logo->width; image.height = logo->height; @@ -684,9 +686,8 @@ int fb_prepare_logo(struct fb_info *info, int rotate) } height = fb_logo.logo->height; -#ifdef CONFIG_FB_LOGO_CENTER - height += (yres - fb_logo.logo->height) / 2; -#endif + if (fb_center_logo) + height += (yres - fb_logo.logo->height) / 2; return fb_prepare_extra_logos(info, height, yres); } diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig index 1e972c4e88b1..d1f6196c8b9a 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig @@ -10,15 +10,6 @@ menuconfig LOGO if LOGO -config FB_LOGO_CENTER - bool "Center the logo" - depends on FB=y - help - When this option is selected, the bootup logo is centered both - horizontally and vertically. If more than one logo is displayed - due to multiple CPUs, the collected line of logos is centered - as a whole. - config FB_LOGO_EXTRA bool depends on FB=y diff --git a/include/linux/fb.h b/include/linux/fb.h index 7cdd31a69719..f52ef0ad6781 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -653,6 +653,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 struct class *fb_class; #define for_each_registered_fb(i) \