From: Sascha Hauer <s.hauer@pengutronix.de>
To: "open list:BAREBOX" <barebox@lists.infradead.org>
Subject: [PATCH v2 12/15] fbconsole: Adjust fbconsole names for overlays
Date: Fri, 27 Sep 2024 12:37:45 +0200 [thread overview]
Message-ID: <20240927-vop2-v2-12-dc8dcfc651d5@pengutronix.de> (raw)
In-Reply-To: <20240927-vop2-v2-0-dc8dcfc651d5@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/video/fbconsole.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbconsole.c b/drivers/video/fbconsole.c
index 01a091d07a..eec524318f 100644
--- a/drivers/video/fbconsole.c
+++ b/drivers/video/fbconsole.c
@@ -1,4 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
+
+#define pr_fmt(fmt) "fbconsole: " fmt
+
#include <common.h>
#include <errno.h>
#include <malloc.h>
@@ -564,9 +567,24 @@ int register_fbconsole(struct fb_info *fb)
struct fbc_priv *priv;
struct console_device *cdev;
int ret;
+ const char *fbname;
priv = xzalloc(sizeof(*priv));
+ /*
+ * fbconsoles are usually just numbered and happen to use the same
+ * number as the fb they are registered on, so we have a nice match.
+ * With overlays we can also have fb names like fb0_0 (for the first
+ * overlay on fb0), and we want to have this name in the corresponding
+ * fbconsole. Skip the "fb" though to keep the existing fbconsole name
+ * for the non overlay framebuffers for compatibility.
+ */
+ fbname = dev_name(&fb->dev);
+ if (strncmp(fbname, "fb", 2))
+ pr_notice("unexpected fb name %s\n", fbname);
+ else
+ fbname += 2;
+
priv->fb = fb;
priv->x = 0;
priv->y = 0;
@@ -578,8 +596,8 @@ int register_fbconsole(struct fb_info *fb)
cdev->tstc = fbc_tstc;
cdev->putc = fbc_putc;
cdev->getc = fbc_getc;
- cdev->devname = "fbconsole";
- cdev->devid = DEVICE_ID_DYNAMIC;
+ cdev->devname = basprintf("fbconsole%s", fbname);
+ cdev->devid = DEVICE_ID_SINGLE;
cdev->open = fbc_open;
cdev->close = fbc_close;
--
2.39.5
next prev parent reply other threads:[~2024-09-27 10:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-27 10:37 [PATCH v2 00/15] video: Add Rockchip VOP2 support Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 01/15] clk: rockchip: rk3568: Fix HDMI clocks Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 02/15] video: add videomode helpers Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 03/15] media-bus-format: update from kernel Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 04/15] regmap: add regfield support Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 05/15] video: add include/video/drm/drm_connector.h Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 06/15] fb: add fb_rect functions Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 07/15] video: Add Sitronix st7789v panel driver Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 08/15] video: add dw-hdmi driver Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 09/15] video: i.MX ipuv3: switch to upstream hdmi driver Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 10/15] fb: Accept overlay framebuffers without modes Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 11/15] fb: print more information on devinfo Sascha Hauer
2024-09-27 10:37 ` Sascha Hauer [this message]
2024-09-27 10:37 ` [PATCH v2 13/15] ARM: ARM64: implement dma_alloc_writecombine() Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 14/15] vpl: make vpl deep probe aware Sascha Hauer
2024-09-27 10:37 ` [PATCH v2 15/15] video: Rockchip: Add VOP2 driver Sascha Hauer
2024-09-30 6:35 ` Ahmad Fatoum
2024-10-01 6:35 ` Sascha Hauer
2024-10-01 6:32 ` [PATCH v2 00/15] video: Add Rockchip VOP2 support Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240927-vop2-v2-12-dc8dcfc651d5@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox