From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E15CE40A920 for ; Tue, 13 Oct 2026 09:33:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791883994; cv=none; b=rPx4Qc+UrRdTiKXnCUmR1hTu6t3Ie8EliUDJ8lSzAn3rjl2Ng02z2ZZn8+KPRujP9P35bHw0Seh1BR+j31r0SZgorJIEsi6muHPtZogSzv/ENgt9GUEf5GsRVtt7HEgOlPJaryS4eKRSiwU04dSIpVDycD88DJNgi8A/oy/m+8c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791883994; c=relaxed/simple; bh=1sI4RrB3Cz4VCdyv6jI1n0jKRwRC4PWdTTVXHirEdoM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=VtTj0rG0qpDMT9V5NES+ColqYOAxSDWhzFFI3iw2fvc0va4nQqdSrzhpjLnEqKWz4kroYpe4u8Oqz8bFpQxPtSAHCwuhXJ35pS0GvtEgGukUAeyDclF0wKtoKkI07sCBOFy8N2wkW/J+btM8mroxmWBGszRO2c4hjYCCWh0fiow= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XU5atTGI; arc=none smtp.client-ip=209.85.221.50 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) header.d=gmail.com header.i=@gmail.com header.b="XU5atTGI" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-48afe75f055so2512709f8f.2 for ; Tue, 13 Oct 2026 02:33:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791883988; x=1792488788; 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=J3Mhzxgfk8rELBjNtRbn8fBvJ+iG+2e3C6/7nA4ujsg=; b=XU5atTGIZH/OyIyYWjfOekJUW7DcJ3kPuO7lEUzH6UgxTmYc8aMO82L3luaV9LsEs5 zKAikQ2vb6YSW4r78EChULEdZFfg99T3ZJN3xMQ5VJWtUlkX3JmjBrc25dBKfO1AJZvA VczBxCpsv6WENrsuy4Goa9mvuL0PJUaEtf0y0OG6JZfN3I2prSRVzU6LWsoE9F2wU+fw z3YCioz+yIVhBBAdryMvho+eD71KGt4DQNcq3MBNLEVvjLe9AebMLBcxLS8SpCEGqDuo OrbB4ia+Wbm+19xgNkEeVAw983GbGFybx2Wvd3mufStsGmY5/HeQXWuHxvqZt6qiYbQ2 AIpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791883988; x=1792488788; 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=J3Mhzxgfk8rELBjNtRbn8fBvJ+iG+2e3C6/7nA4ujsg=; b=Vjsv/ehBvbgMSE66An/jjFg4D3a37xA50Rq/+3RTBSPL9VMr78NYUSKQHZ1VBPTOzY VP+czj96EjEIh7qDcJZ+V01a+XzW76pk75MIuIsb6IERYr7aMuaCVbi+BVQKJOl+tk5/ gcXTEJEWlzF13ScnR11u7t2kTCtFZ2u+E20ZEQWTxMmLr+VVqvo9nXZ0E63+WBOLIQHG tCIO9udatOrTkFKVc7BP1wqbqmt37ajfgQ1MQLHujuJ9rG6FRWwhDMRyzbWMxDF1fCxW Wb/G+RJxc3YN14aHxNxaauqaCsUiFyZ/8TYJ5mOXyEzVkWz4mzCmqrJppmOyIHiBi8OR XDxA== X-Forwarded-Encrypted: i=1; AKwUvBz4CqnX98zjaS1AF+UAAqvuuWidny+lzT//ENnURdwZaFlW9J1LGEw2ynzP+5IV6OuPRBdvii3Z02Hy5mCdgQ==@vger.kernel.org X-Gm-Message-State: AFq9FYJhZcp+J7j3L0nfkoiSwfwoaTEW2Qb3+K4ybBal/RdJrWVHGuoK NJxOU81az0x3mzRDv+wFp9EHcpx4h+Zss7gYhcOTENaHrxu+d4RKZu0R X-Gm-Gg: AYBFou3mbp4RHxPZRIcnont2K4bs9ojIRQUk/5GFhu2revla+Ga1FYKyllaoDLvtPz2 aEzUme6QjfMhX6R6DJKEW9eiFeZVaaWbByqzK4UHR9VSUmB8h3lzZ9OhABIBKBFN1AdzWWT/kPG mbNtCDhjy1h0JUutpSEzSMOX+7JFk+6cIMabiQs25RioulUl409fFQO7DZ/R2Jv2ATsglpoj4+y HlNQLbkNKUUIbqYIDt3zUUM/C9fMqEAvPBYwhpMoM3ZKCccBTYIHxpab/pICieiEvauvtZNc+F7 KFYGEDIgs5msqjTntwJyqh/K5LWzC5gvRM6lK7z3yxDP5U2bQA4UFVAxgTXx/xIULOn9RP2NqPN O+ipQAMqEWAyDzgFKfIwRzXeXco6LVjZagzmJYl0HA2T8dz5Dd/WgJLdQwRQObkxVWgu/VcSfRU haUpnRkk8AyLEb2MxDCuuz7YY5P9bWSf/aTO6bnlfQKdD3MK7fAqVSEXlXDSV/621zECMkMgCt8 QwK7WfxLEhWcdXFPVQOFLSZ X-Received: by 2002:a05:6000:46c7:b0:48c:6955:a603 with SMTP id ffacd0b85a97d-48dbaadd962mr15329987f8f.13.1791883987585; Tue, 13 Oct 2026 02:33:07 -0700 (PDT) Received: from ingenieria31.oficinasStQ.local ([79.112.15.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de0bc4ec6sm3986774f8f.48.2026.10.13.02.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 02:33:06 -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 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-doc@vger.kernel.org, linux-embedded@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 08/13] drm/client: splash: place the device tree image where it asks Date: Tue, 13 Oct 2026 11:32:38 +0200 Message-Id: <20261013093243.505776-9-maximpedraza@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20261013093243.505776-1-maximpedraza@gmail.com> References: <20261013093243.505776-1-maximpedraza@gmail.com> Precedence: bulk X-Mailing-List: linux-embedded@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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, so 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 | 73 ++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/clients/drm_splash.c b/drivers/gpu/drm/clients/drm_splash.c index 50842922a7f8..8561d00a5b96 100644 --- a/drivers/gpu/drm/clients/drm_splash.c +++ b/drivers/gpu/drm/clients/drm_splash.c @@ -122,6 +122,14 @@ struct drm_splash { void *map_data; 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) @@ -260,13 +268,21 @@ static struct device_node *drm_splash_dt_node(struct drm_splash *splash) return NULL; } -static bool drm_splash_dt_available(struct drm_splash *splash) +/* The optional placement properties of the node, read once */ +static void drm_splash_dt_placement(struct drm_splash *splash, + struct device_node *np) { - struct device_node *np = drm_splash_dt_node(splash); + u32 val[2]; - of_node_put(np); + if (!of_property_read_u32_array(np, "logo-position", val, 2)) { + splash->pos_x = (s32)val[0]; + splash->pos_y = (s32)val[1]; + } - return np; + if (!of_property_read_u32_array(np, "logo-offset", val, 2)) { + splash->off_x = (s32)val[0]; + splash->off_y = (s32)val[1]; + } } static int drm_splash_dt_load(struct drm_splash *splash, const u8 **data, @@ -319,9 +335,14 @@ static int drm_splash_dt_load(struct drm_splash *splash, const u8 **data, return ret; } #else -static bool drm_splash_dt_available(struct drm_splash *splash) +static struct device_node *drm_splash_dt_node(struct drm_splash *splash) +{ + return NULL; +} + +static void drm_splash_dt_placement(struct drm_splash *splash, + struct device_node *np) { - return false; } static int drm_splash_dt_load(struct drm_splash *splash, @@ -438,6 +459,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); +} + static void drm_splash_blit_pix16(struct iosys_map *map, unsigned int dpitch, unsigned int x_pad, unsigned int y_pad, const u8 *sbuf8, unsigned int spitch, @@ -636,9 +677,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; @@ -721,8 +763,15 @@ 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_available(splash)) + struct device_node *np; + + np = drm_splash_dt_node(splash); + if (np) { + drm_splash_dt_placement(splash, np); + of_node_put(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)) @@ -1144,6 +1193,10 @@ void drm_splash_register(struct drm_device *dev, spin_lock_init(&splash->fw_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