From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.221.50 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793109251; b=KZDx80KPT5jBDt8KdLdA8Al0Q7iA1fMXnqc23kMYoinsyIzHj0WtrwiZ/nQZ2A+sQxUG VnQpN0COBvvenmUy5KlyIN8CEAsYic9lbg93cp/EUwieBrqqak+WCRMC6JDhvt55xlsws 8G4uFOJD6i2FVXcHYXmbwD9jeknWqv35oC6uiCWqazg7HFESKhgcr+SMueYx9dgAqYUZ/ grdXPYvTmfA3jrBd9Zqw/YWF+nr04YKE+eDD9JiYJB9Jdu6fsw9kexeIHryMMg6rtv+8X EIhVwbEWeQwNGh9uh17xSXAHz5LZsdShq0h7s+ityxZB2jAcftu53fTx7vhUPdno+LA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793109251; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=fU1UKpzBNuXU6ySePDsKYMB2Kq9NDiCM/53N3kd7ajQ=; b=giq38ggfApcR1niP2BL/TllU3oUiNCatc0Fmu6YfsTVjbBkquZj64qWlGQGPc+e9VlCj Hpb0MA9WoqD5jaUOIfs4+tkKKWPBU3r+MwuGWt4LTAfRqy6JcPY9JTO1+NZGubn2A8oU5 J37TigdyIzMuJwus5vg2R8w7qlp6OkAvW5sai7MeIYDPJ5nRAjGtkiQueUMjySGrcqmfm TNKvzd6I0lTwq/6Thxzp2ofE41yxr7MFnnytluyMT2HLtz5u5Jo2M3Gp6yFuZcY1wKCMJ Vxf/QPZOAKs0Fzq/Bed6vCInucjrprblnT34gOTbU/U7cFvsXZh9TG4L5LogrIF3wVA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=IqGU5Z+y; arc=none smtp.remote-ip=209.85.221.50 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D71DE60A5BD1 for ; Tue, 27 Oct 2026 13:54:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org D71DE60A5BD1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=IqGU5Z+y Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-48c4d870d54so2430009f8f.2 for ; Tue, 27 Oct 2026 06:54:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1793109249; x=1793714049; darn=vger.kernel.org; h=content-transfer-encoding:content-type: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=fU1UKpzBNuXU6ySePDsKYMB2Kq9NDiCM/53N3kd7ajQ=; b=IqGU5Z+yI//Uf1f1InC3HbWaNBA9juMow4J6j21/IjLsy/OIkWb8l1dy+22F09jNzV pDR9l4AM1iB5b8gdMgCmA0McivtMFc6/ynrCQY5iULmmlvGkphtZuPZCoI6JVhhKEqpr Dg6sHWh0itWUOkLmnyLLremMAkJYHAFS3DgTLLk9/Ow9xQF2aPYwQB3ZcNOm9QJ5T/Rv rlGXXpvjjleJRsRRPJkYgVlQPOsMaNo8Jxb1RIA2rbddhAZpnELZLvMn5wkRBRDtEBMb +uugvAZLXOPIMdh37rUjulu/J+SLa8Lu5eURbtTL03+78xOqgArIfXFyBmKmKslt5eBh ANCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793109249; x=1793714049; h=content-transfer-encoding:content-type: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=fU1UKpzBNuXU6ySePDsKYMB2Kq9NDiCM/53N3kd7ajQ=; b=MfH3UlDOhatffn8PBLjtOco1V3nRhOOZbbSHMoOfYyjCrUEzrebxqrhk32fhbLn6OY ZuRHUbTVymsTh9NRwWdde2yNstL6MCHqWU5FfNE1yKdL8/W5e9qKuZqKerbKkITlpF+r 3Ff7iHBI2OrOk4Vpsr1ijXJboOqwsZFlh4/012ah/LtgVBW5N7Nu8p9JdcL3Tu0v5j1P mX9KNj7nhkUp39UW6lBfraeZ/aBiyp7g6XXfSUnAoyE5iv5TJI/deQJwTt3aHIaPS3mo SyraFzI5loIV7bj4bUmRxzhCdfzlzA+lXifdiQeRpUbUuDFXna39NPIFikmYl6/SMiSS 9bCg== X-Forwarded-Encrypted: i=1; AKwUvBzyMW8CRD0L8iu36+X8TsOkXsZBkbJM42b8rnDkkl7T3YI5PJyS5epTn2UozBa6cu73YIxhMGy91qrU@vger.kernel.org X-Gm-Message-State: AFq9FYI1hAak2ktc34LIiR8HUGanMogNF/IJU0Tda3v0jkKTnBXJxzo7 6RNFr++040gt64wJbfdSD3JwLeyHkAInVB5OUwMQqSu+Qis1/CebD9ZC X-Gm-Gg: AYBFou3Js7eg9MT5MZ+e/CweZb505awm6DGK4yiG6olPQfdDvFxIHqMiJDUFdo3FEDa jqVGmn+qmG4mSl8a2yyt2vasLDdcBnh56T9eXQmLJSrl/qQ108Dj37s8wEk567D3Le1YzxrwbRx XJUcZp0T3osBt1AEmF2USh43z2onewokmUCPYOE2c+xBm/u1IN21mmOICy1ze2fnWnOKqbsceqb EBgT2D6MmqbUrvMOPZTCWGZQw5YtbeLJ6F7GQn+n7rHUZMAq7B8HuoQgkW5ZnY1v5F6bqKhxwP2 VTg1HV6X2pTkVw5mjuFjJse9ON77jBuGnPcUa1z4pCdo3QFFSiU33l1S9AQW5oNS9nJtA8MLbX0 Qtxdg6nX77DQwKX3c61xdKPregwnqI+Ft/HCqgEA01PS+fa6qhcd+scdfxXtTnd4aQiVnrwkvPZ r05dd8kM2TEAjqIqlXvrRU9Rc9ym5mPSfZOSgxsbRULg//U2SkqSX8Gvx/yOjCBtlc2XIS53Pws ujLF3F4siH6jjk25nh+2bOIWlj/6k7nfHOazZsTKtYRidFk5nYSIXG1Fh11GoekqzoF8roUCEBx JtyKAIs= X-Received: by 2002:adf:e186:0:b0:48d:eec5:d243 with SMTP id ffacd0b85a97d-48e3eb8b71emr19191940f8f.9.1793109249072; Tue, 27 Oct 2026 06:54:09 -0700 (PDT) Received: from ingenieria31.oficinasStQ.local ([79.117.46.175]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48e3ebcb846sm23128058f8f.25.2026.10.27.06.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2026 06:54:08 -0700 (PDT) From: =?UTF-8?q?M=C3=A0xim=20Pedraza=20Padilla?= To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Ard Biesheuvel , Jonathan Corbet , Helge Deller , Peter Jones Cc: Francesco Valla , Jani Nikula , Mario Limonciello , Javier Martinez Canillas , Jocelyn Falempe , Sam Ravnborg , Ilias Apalodimas , Shuah Khan , Randy Dunlap , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-efi@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-embedded@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 10/15] drm/client: splash: place the device tree image where it asks Date: Tue, 27 Oct 2026 14:53:37 +0100 Message-Id: <20261027135342.2003632-11-maximpedraza@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20261027135342.2003632-1-maximpedraza@gmail.com> References: <20261027135342.2003632-1-maximpedraza@gmail.com> X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A logo supplied by the device tree describes a particular product, and where it lands on the panel matters: some panels only show part of the mode, so the middle of the mode is not the middle of what the user sees. Read the optional "logo-position" and "logo-offset" properties of the node. The position is the top left corner, with -1 on an axis meaning centre on that axis, and the offset is added afterwards, which is the only way to say "below the centre" when the device tree does not know the image size, as with an image in a reserved region. Both come straight from the device tree. A property that is not two cells, or that is out of the binding's range, is reported and keeps its default; otherwise the sum is done in 64 bits and clamped, and a silly pair of values lands the image against an edge rather than off the screen: the blitters do not clip. Every other source keeps being centred, except the BGRT, which keeps its own offsets. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Màxim Pedraza Padilla --- drivers/gpu/drm/clients/drm_splash.c | 82 ++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/clients/drm_splash.c b/drivers/gpu/drm/clients/drm_splash.c index 618c060f33d5..81070547390f 100644 --- a/drivers/gpu/drm/clients/drm_splash.c +++ b/drivers/gpu/drm/clients/drm_splash.c @@ -106,6 +106,14 @@ struct drm_splash { size_t dt_len; enum drm_splash_source src; + + /* + * Where the image goes, in screen pixels: a coordinate of -1 centres + * it on that axis, and the offset is added afterwards. Only the device + * tree asks for anything but the centre. + */ + s32 pos_x, pos_y; + s32 off_x, off_y; }; static struct drm_splash *client_to_drm_splash(struct drm_client_dev *client) @@ -238,6 +246,39 @@ static struct device_node *drm_splash_dt_node(struct drm_splash *splash) return NULL; } +/* An X and Y pair; anything but two cells from @min to @max is reported */ +static void drm_splash_dt_pair(struct drm_splash *splash, + struct device_node *np, const char *name, + s32 min, s32 max, s32 *x, s32 *y) +{ + u32 val[2]; + + if (!of_property_present(np, name)) + return; + + if (of_property_count_u32_elems(np, name) != 2 || + of_property_read_u32_array(np, name, val, 2) || + (s32)val[0] < min || (s32)val[0] > max || + (s32)val[1] < min || (s32)val[1] > max) { + drm_warn(splash->client.dev, "splash: %pOF: invalid %s\n", + np, name); + return; + } + + *x = val[0]; + *y = val[1]; +} + +/* The optional placement properties of the node, read once */ +static void drm_splash_dt_placement(struct drm_splash *splash, + struct device_node *np) +{ + drm_splash_dt_pair(splash, np, "logo-position", -1, 65535, + &splash->pos_x, &splash->pos_y); + drm_splash_dt_pair(splash, np, "logo-offset", -65535, 65535, + &splash->off_x, &splash->off_y); +} + /* * Find the image when the source is picked, and keep it for the outputs * plugged in later. A node whose image cannot be had leaves the other @@ -307,6 +348,11 @@ static bool drm_splash_dt_open(struct drm_splash *splash) return false; } +static void drm_splash_dt_placement(struct drm_splash *splash, + struct device_node *np) +{ +} + static int drm_splash_dt_load(struct drm_splash *splash, const u8 **data, size_t *size) { @@ -428,6 +474,26 @@ static int drm_splash_fill_solid_color(struct drm_client_buffer *buffer, } #if IS_ENABLED(CONFIG_DRM_CLIENT_SPLASH_BMP_SUPPORT) +/* + * Place the image along one axis of the screen. @pos is the coordinate asked + * for, or -1 to centre on that axis, and @off is added afterwards. Both may + * come from the device tree, so the sum is done wide enough not to wrap, and + * the result keeps the whole image on the screen: the blitters do not clip. + */ +static unsigned int drm_splash_place_axis(s32 pos, s32 off, unsigned int span, + unsigned int size) +{ + s64 last = (s64)span - size; + s64 coord; + + if (last <= 0) + return 0; + + coord = pos == -1 ? last / 2 : pos; + + return clamp_t(s64, coord + off, 0, last); +} + /* The rows of a 24 bpp BMP, bottom up or top down, upright in XRGB8888 */ static void drm_splash_bmp_decode(u32 *dst, const u8 *src, unsigned int spitch, unsigned int width, unsigned int height, @@ -595,9 +661,10 @@ static int drm_splash_bmp_to_scanout(struct drm_splash *splash, } #endif } else { - /* Center X and Y */ - x_pad = (scanout->width - bmp_width) / 2; - y_pad = (scanout->height - bmp_height) / 2; + x_pad = drm_splash_place_axis(splash->pos_x, splash->off_x, + scanout->width, bmp_width); + y_pad = drm_splash_place_axis(splash->pos_y, splash->off_y, + scanout->height, bmp_height); } image_data = data + bitmap_offset; @@ -659,8 +726,11 @@ static int drm_splash_image_load(struct drm_splash *splash, const u8 **img_data, */ static enum drm_splash_source drm_splash_pick_source(struct drm_splash *splash) { - if (drm_splash_dt_open(splash)) + if (drm_splash_dt_open(splash)) { + drm_splash_dt_placement(splash, splash->dt_np); return DRM_SPLASH_SRC_DT; + } + if (drm_splash_bgrt_available(splash)) return DRM_SPLASH_SRC_BGRT; if (IS_ENABLED(CONFIG_DRM_CLIENT_SPLASH_SRC_BMP)) @@ -1114,6 +1184,10 @@ void drm_splash_register(struct drm_device *dev, mutex_init(&splash->lock); init_completion(&splash->fw_done); + /* Centred unless the image source asks otherwise */ + splash->pos_x = -1; + splash->pos_y = -1; + if (format && format->num_planes == 1) { splash->preferred_format = format->format; } else { -- 2.39.5