From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 07F45C55174 for ; Sat, 1 Aug 2026 07:58:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 08F4710E2E2; Sat, 1 Aug 2026 07:58:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CfbxUh8i"; dkim-atps=neutral Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id EB02610F431 for ; Fri, 31 Jul 2026 21:50:49 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-47df43bfb07so753353f8f.1 for ; Fri, 31 Jul 2026 14:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785534648; x=1786139448; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=xecpazbmAHToNRI7HHvo3rBeU785pIEnzPP95T0hHMQ=; b=CfbxUh8ig5cy1a+GGksN+8kBXld50oz1fnVPUk1tP8G64FDwYOwsl1lwMIFTwQNkjz 6tCt0UpC8RKJ8FH8+8NNwVh+6+w2UxyE0mWRe2c+Sc6UrSaUm3e91CfYRxrHs2d7NFsQ jhPD+8xNTdIEPNTMtaAskwhiV/iPwty4cGmBu3uUha81ABokALLjPoV3aJv5vJPgz2/k TmcxI2cCNuvi9+tWAKPX77l69AkDiX/AM6Cwfd/lMdlQywbFUhoUr9DMWeuLmSwZWvU9 UhZN4LWw2rSHLla/ggZb+TU/vCpCbW5s+CtUjx4BbNT70QlHWDrViI7ByZ0ulCPtV6JJ LVrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785534648; x=1786139448; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=xecpazbmAHToNRI7HHvo3rBeU785pIEnzPP95T0hHMQ=; b=RQmb6rVBDhE7IwWZ3vYv0fTPEdzNS1lDORt42F5gENz2PUupayDeB9fvpJR3mju235 ca0Sc/AfnlHaoU48CyScCFdf+bTAYT+nc/mm0+Gb2sPlT9edUT2VyTCrT4/0iqXN5cXp c3YBd/44mVoygG6D9vyHCRyHiS9/EczLYTWfhfSO+yqHaOlTSFNdM17pPhtICkLhzGan KgFy7U5Liug8zMZAQGso6sSsiX1DgLdmqyx/Jjdj+DX5MzZGRntDo1caHjOYGn41sKqg vbk4QKY5PmM+JHXkTC36Sck3M4ipwgPZDy8vZQBbE9K78x2eMWuAdJrlhjfLAaiRCd6a KAxA== X-Forwarded-Encrypted: i=1; AHgh+RrApAnnL37mUWu5Xo+Imlc2SE6WsQY+Z1XEchPJtN8gSiVtayGUJQOAk4N4bDK9VvQzmnAUKMFj/Tc=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yy9QMCJWQAftKkhSzeu0f0n1tnAxDsDYTGqmZkvWOyL+PpMYU4d A0lFoHpLzx60jUFfi2tH5VOQ3pYhHx+gKtbGGAey7Ot9sTxB2l/d1S+S X-Gm-Gg: AR+sD12SPshdg29nBpJiTcAchU9IWEzIrMyike+CbvvRtAsdFqjrRg6MBykDyuGeAaL m+FiSozx/w7Pq8O1I00mvXLfflD7vDvByt7Y5rwDEsoBPiP7mMhfAV1D816WKb+xvETMkxNMCzF 0F45k65xLCAftzDIHy9vSpcNO5mXtEs6k2f4AqHz7R19tK+BYfMES8zmEYWs8HkhgvXvWNjsZOW xoudxpQ0YVb080SP9C2+B2VbaoZ2UmgNREAEkA6sKAX9lpy25JPaNbEjF42OlqU9Y/fuO0GykMV NExq3jGaWmIZepZBbQZOGNTMVshtZQLvDSMvMh2z7Zd+D9ORYTGLkMOulM7IqAn608ms4ijzDXf pHXqJOWct0sc337XNSxxIoeZdlNcuxH9HuaZ19xzeOVEAuc2gFIQq8eCRsKAGuENs6t/uYOCzeA /6h4MolOl0Jmk26motskarHuRsu+Dr9eFNquNyjLjtCGpbz0sJTjZxalp9ILgFohlLqRvOhgVTY uY6LZ0DsQAtxHOXTeP11CaB X-Received: by 2002:a5d:64ed:0:b0:47f:77dc:b072 with SMTP id ffacd0b85a97d-47fd72c65f5mr2415622f8f.18.1785534648239; Fri, 31 Jul 2026 14:50:48 -0700 (PDT) Received: from ingenieria31.oficinasStQ.local ([79.116.62.64]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd41e2484sm10186342f8f.11.2026.07.31.14.50.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 14:50:47 -0700 (PDT) From: Max Pedraza To: Helge Deller Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Zimmermann , Maxime Ripard , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Max Pedraza Subject: [RFC PATCH 2/6] video: logo: allow the boot logo to come from the device tree Date: Fri, 31 Jul 2026 23:50:39 +0200 Message-Id: <20260731215043.30392-3-maximpedraza@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260731215043.30392-1-maximpedraza@gmail.com> References: <20260731215043.30392-1-maximpedraza@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Sat, 01 Aug 2026 07:57:53 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" With CONFIG_LOGO_DT_CLUT224 enabled, look for a node compatible with "linux,boot-logo-clut224" and, when one is present and enabled, use the image it carries in preference to the logos built into the kernel image. This lets a single kernel image serve several products, or several revisions of one product, that differ only in branding, at the cost of a larger device tree blob. The image is validated while it is parsed: the palette must be at most 224 entries, the pixel data length must match the declared geometry, and every pixel must reference an existing palette entry. A malformed node is reported and ignored, falling back to the built-in logo. The two allocations live for as long as the built-in logos do; they are released from fb_logo_late_init(), next to where the __initdata logos are marked as freed. If the node is absent or disabled, behaviour is unchanged. Signed-off-by: Max Pedraza --- drivers/video/logo/Kconfig | 13 +++ drivers/video/logo/logo.c | 157 +++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+) diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig index ce6bb7535..4af349b20 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig @@ -70,4 +70,17 @@ config LOGO_SUPERH_CLUT224 depends on SUPERH default y +config LOGO_DT_CLUT224 + bool "224-color logo supplied by the device tree" + depends on OF + help + Look for a boot logo in the device tree, in a node compatible with + "linux,boot-logo-clut224", instead of using one of the logos built + into the kernel image. This allows a single kernel image to be used + by several products that only differ in branding, at the cost of + making the device tree blob larger. + + If no such node is present, or it is disabled, the built-in logo + selected above is used, so saying Y here is safe. If unsure, say N. + endif # LOGO diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index 141f15a9a..b4f533df0 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c @@ -11,6 +11,9 @@ */ #include +#include +#include +#include #include #include @@ -22,6 +25,155 @@ static bool nologo; module_param(nologo, bool, 0); MODULE_PARM_DESC(nologo, "Disables startup logo"); +#ifdef CONFIG_LOGO_DT_CLUT224 + +#define LOGO_DT_COMPATIBLE "linux,boot-logo-clut224" +#define LOGO_DT_MAX_CLUT 224 +/* + * The first 32 palette entries are reserved for the console, so the logo + * colours start at index 32. That is an implementation detail of the frame + * buffer layer rather than a property of the image, so the device tree stores + * plain indices and the offset is applied here. + */ +#define LOGO_DT_CLUT_OFFSET 32 +/* Sanity limit on the image size, a device tree is not a good place for more */ +#define LOGO_DT_MAX_PIXELS SZ_32M + +static struct linux_logo logo_dt_clut224 = { + .type = LINUX_LOGO_CLUT224, +}; + +static unsigned char *logo_dt_clut; +static unsigned char *logo_dt_data; + +static int logo_dt_parse(struct device_node *np) +{ + unsigned int clutsize, npixels, i; + unsigned char *clut, *data; + u32 width, height; + int len, ret; + + ret = of_property_read_u32(np, "width", &width); + if (ret) + return ret; + + ret = of_property_read_u32(np, "height", &height); + if (ret) + return ret; + + if (!width || !height || (u64)width * height > LOGO_DT_MAX_PIXELS) + return -EINVAL; + + npixels = width * height; + + len = of_property_count_u8_elems(np, "clut"); + if (len < 3 || len % 3) + return -EINVAL; + + clutsize = len / 3; + if (clutsize > LOGO_DT_MAX_CLUT) + return -EINVAL; + + ret = of_property_count_u8_elems(np, "data"); + if (ret < 0) + return ret; + if ((unsigned int)ret != npixels) + return -EINVAL; + + clut = kmalloc(len, GFP_KERNEL); + if (!clut) + return -ENOMEM; + + data = kmalloc(npixels, GFP_KERNEL); + if (!data) { + ret = -ENOMEM; + goto err_free_clut; + } + + ret = of_property_read_u8_array(np, "clut", clut, len); + if (ret) + goto err_free_data; + + ret = of_property_read_u8_array(np, "data", data, npixels); + if (ret) + goto err_free_data; + + for (i = 0; i < npixels; i++) { + if (data[i] >= clutsize) { + ret = -ERANGE; + goto err_free_data; + } + data[i] += LOGO_DT_CLUT_OFFSET; + } + + logo_dt_clut = clut; + logo_dt_data = data; + + logo_dt_clut224.width = width; + logo_dt_clut224.height = height; + logo_dt_clut224.clutsize = clutsize; + logo_dt_clut224.clut = clut; + logo_dt_clut224.data = data; + + return 0; + +err_free_data: + kfree(data); +err_free_clut: + kfree(clut); + return ret; +} + +static const struct linux_logo *logo_dt_find(void) +{ + static bool probed; + struct device_node *np; + int ret; + + if (probed) + return logo_dt_data ? &logo_dt_clut224 : NULL; + + probed = true; + + np = of_find_compatible_node(NULL, NULL, LOGO_DT_COMPATIBLE); + if (!np) + return NULL; + + if (of_device_is_available(np)) { + ret = logo_dt_parse(np); + if (ret) + pr_warn("logo: ignoring malformed %pOF node (%d)\n", + np, ret); + } + + of_node_put(np); + + return logo_dt_data ? &logo_dt_clut224 : NULL; +} + +static void logo_dt_free(void) +{ + logo_dt_clut224.clut = NULL; + logo_dt_clut224.data = NULL; + + kfree(logo_dt_clut); + logo_dt_clut = NULL; + + kfree(logo_dt_data); + logo_dt_data = NULL; +} + +#else /* !CONFIG_LOGO_DT_CLUT224 */ + +static inline const struct linux_logo *logo_dt_find(void) +{ + return NULL; +} + +static inline void logo_dt_free(void) { } + +#endif /* CONFIG_LOGO_DT_CLUT224 */ + /* * Logos are located in the initdata, and will be freed in kernel_init. * Use late_init to mark the logos as freed to prevent any further use. @@ -32,6 +184,7 @@ static bool logos_freed; static int __init fb_logo_late_init(void) { logos_freed = true; + logo_dt_free(); return 0; } @@ -71,6 +224,10 @@ const struct linux_logo * __ref fb_find_logo(int depth) } if (depth >= 8) { + /* A logo supplied by the device tree wins over the built-in ones */ + logo = logo_dt_find(); + if (logo) + return logo; #ifdef CONFIG_LOGO_LINUX_CLUT224 /* Generic Linux logo */ logo = &logo_linux_clut224; -- 2.39.5