From patchwork Wed Oct 25 12:45:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 'Max Staudt X-Patchwork-Id: 10026633 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BA3BF603D7 for ; Wed, 25 Oct 2017 12:47:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7A6F28B61 for ; Wed, 25 Oct 2017 12:47:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC8D028B63; Wed, 25 Oct 2017 12:47:52 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable 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 56E1028B74 for ; Wed, 25 Oct 2017 12:47:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751029AbdJYMr0 (ORCPT ); Wed, 25 Oct 2017 08:47:26 -0400 Received: from mx2.suse.de ([195.135.220.15]:36169 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751883AbdJYMqd (ORCPT ); Wed, 25 Oct 2017 08:46:33 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 87454AD65; Wed, 25 Oct 2017 12:46:28 +0000 (UTC) From: Max Staudt To: b.zolnierkie@samsung.com, linux-fbdev@vger.kernel.org Cc: mstaudt@suse.de, tiwai@suse.com, oneukum@suse.com, msrb@suse.com, sndirsch@suse.com, michal@markovi.net, linux-kernel@vger.kernel.org Subject: [RFC 09/14] bootsplash: Add corner positioning Date: Wed, 25 Oct 2017 14:45:57 +0200 Message-Id: <20171025124602.28292-10-mstaudt@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20171025124602.28292-1-mstaudt@suse.de> References: <20171025124602.28292-1-mstaudt@suse.de> 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 This allows showing multiple logos, each in its own position, relative to the eight screen corners. Signed-off-by: Max Staudt Reviewed-by: Oliver Neukum --- drivers/video/fbdev/core/bootsplash_file.h | 42 ++++++++++++++++++++- drivers/video/fbdev/core/bootsplash_render.c | 55 +++++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/core/bootsplash_file.h b/drivers/video/fbdev/core/bootsplash_file.h index f33577e062ca..59a084a05171 100644 --- a/drivers/video/fbdev/core/bootsplash_file.h +++ b/drivers/video/fbdev/core/bootsplash_file.h @@ -87,7 +87,28 @@ struct splash_pic_header { */ u8 num_blobs; - u8 padding[11]; + + /* Corner to paint the picture in. + * 0 - Center + * 1 - Top left + * 2 - Top + * 3 - Top right + * 4 - Right + * 5 - Bottom right + * 6 - Bottom + * 7 - Bottom left + * 8 - Left + */ + u8 corner; + + /* Pixel offset from the screen margins. + * Example: If the picture is in the top right corner, it will + * be places corner_offset pixels from the top and + * corner_pixels from the right margin. + */ + u8 corner_offset; + + u8 padding[9]; } __attribute__((__packed__)); @@ -109,4 +130,23 @@ struct splash_blob_header { u8 padding[9]; } __attribute__((__packed__)); + + + +/* + * Enums for on-disk types + */ + +enum splash_corner { + SPLASH_CORNER_CENTER = 0, + SPLASH_CORNER_TOP_LEFT = 1, + SPLASH_CORNER_TOP = 2, + SPLASH_CORNER_TOP_RIGHT = 3, + SPLASH_CORNER_RIGHT = 4, + SPLASH_CORNER_BOTTOM_RIGHT = 5, + SPLASH_CORNER_BOTTOM = 6, + SPLASH_CORNER_BOTTOM_LEFT = 7, + SPLASH_CORNER_LEFT = 8, +}; + #endif diff --git a/drivers/video/fbdev/core/bootsplash_render.c b/drivers/video/fbdev/core/bootsplash_render.c index 72d9867c4656..444233583f6f 100644 --- a/drivers/video/fbdev/core/bootsplash_render.c +++ b/drivers/video/fbdev/core/bootsplash_render.c @@ -161,6 +161,7 @@ void bootsplash_do_render_pictures(struct fb_info *info) for (i = 0; i < splash_global.header->num_pics; i++) { struct splash_blob_priv *bp; struct splash_pic_priv *pp = &splash_global.pics[i]; + struct splash_pic_header *ph = pp->pic_header; long dst_xoff, dst_yoff; if (pp->blobs_loaded < 1) @@ -171,8 +172,58 @@ void bootsplash_do_render_pictures(struct fb_info *info) if (!bp || bp->blob_header->type != 0) continue; - dst_xoff = (info->var.xres - pp->pic_header->width) / 2; - dst_yoff = (info->var.yres - pp->pic_header->height) / 2; + switch (ph->corner) { + case SPLASH_CORNER_TOP_LEFT: + dst_xoff = 0 + ph->corner_offset; + dst_yoff = 0 + ph->corner_offset; + break; + case SPLASH_CORNER_TOP: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = 0 + ph->corner_offset; + break; + case SPLASH_CORNER_TOP_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width + - ph->corner_offset; + dst_yoff = 0 + ph->corner_offset; + break; + case SPLASH_CORNER_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width + - ph->corner_offset; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + break; + case SPLASH_CORNER_BOTTOM_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width + - ph->corner_offset; + dst_yoff = info->var.yres - pp->pic_header->height + - ph->corner_offset; + break; + case SPLASH_CORNER_BOTTOM: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height + - ph->corner_offset; + break; + case SPLASH_CORNER_BOTTOM_LEFT: + dst_xoff = 0 + ph->corner_offset; + dst_yoff = info->var.yres - pp->pic_header->height + - ph->corner_offset; + break; + case SPLASH_CORNER_LEFT: + dst_xoff = 0 + ph->corner_offset; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + break; + + case SPLASH_CORNER_CENTER: + default: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + break; + } if (dst_xoff < 0 || dst_yoff < 0