From: Max Staudt <mstaudt@suse.de>
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 [thread overview]
Message-ID: <20171025124602.28292-10-mstaudt@suse.de> (raw)
In-Reply-To: <20171025124602.28292-1-mstaudt@suse.de>
This allows showing multiple logos, each in its own position,
relative to the eight screen corners.
Signed-off-by: Max Staudt <mstaudt@suse.de>
Reviewed-by: Oliver Neukum <oneukum@suse.com>
---
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
--
2.12.3
next prev parent reply other threads:[~2017-10-25 12:47 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-25 12:45 [RFC 00/14] Kernel based bootsplash Max Staudt
2017-10-25 12:45 ` [RFC 01/14] bootsplash: Initial implementation showing black screen Max Staudt
2017-10-25 17:26 ` Randy Dunlap
2017-10-25 12:45 ` [RFC 02/14] bootsplash: Add platform device Max Staudt
2017-10-25 12:45 ` [RFC 03/14] bootsplash: Flush framebuffer after drawing Max Staudt
2017-10-25 12:45 ` [RFC 04/14] bootsplash: Redraw on suspend/hibernate Max Staudt
2017-10-25 12:45 ` [RFC 05/14] bootsplash: Disable splash on oops Max Staudt
2017-10-25 12:45 ` [RFC 06/14] bootsplash: Disable on SysRq SAK Max Staudt
2017-10-25 12:45 ` [RFC 07/14] bootsplash: Add VT keyboard hook Max Staudt
2017-10-25 12:45 ` [RFC 08/14] bootsplash: Add file reading and picture rendering Max Staudt
2017-10-25 17:32 ` Randy Dunlap
2017-10-25 20:27 ` Takashi Iwai
2017-10-27 11:21 ` Max Staudt
2017-10-25 12:45 ` Max Staudt [this message]
2017-10-25 12:45 ` [RFC 10/14] bootsplash: Add animation support Max Staudt
2017-10-25 17:20 ` Randy Dunlap
2017-10-25 17:23 ` Max Staudt
2017-10-25 12:45 ` [RFC 11/14] bootsplash: Redraw fully on console_unblank Max Staudt
2017-10-25 12:46 ` [RFC 12/14] bootsplash: Add sysfs ABI documentation Max Staudt
2017-10-25 12:46 ` [RFC 13/14] bootsplash: Add main documentation Max Staudt
2017-10-25 17:43 ` Randy Dunlap
2017-10-27 11:19 ` Max Staudt
2017-10-27 16:48 ` Randy Dunlap
2017-10-25 12:46 ` [RFC 14/14] bootsplash: Update MAINTAINERS Max Staudt
2017-11-09 11:56 ` [RFC 00/14] Kernel based bootsplash Pavel Machek
2017-11-09 12:36 ` Oliver Neukum
2017-11-09 18:45 ` Pavel Machek
2017-11-10 16:53 ` Takashi Iwai
2017-11-09 12:42 ` Takashi Iwai
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=20171025124602.28292-10-mstaudt@suse.de \
--to=mstaudt@suse.de \
--cc=b.zolnierkie@samsung.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal@markovi.net \
--cc=msrb@suse.com \
--cc=oneukum@suse.com \
--cc=sndirsch@suse.com \
--cc=tiwai@suse.com \
/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;
as well as URLs for NNTP newsgroup(s).