* [PATCH 1/2] logo: add option to return largest logo for a given resolution
2015-07-07 14:24 [PATCH 0/2 v2] video/logo: add option to return largest logo for a given resolution Urs Fässler
@ 2015-07-07 14:24 ` Urs Fässler
2015-07-07 14:24 ` [PATCH 2/2] fbdev: use largest logo if possible Urs Fässler
1 sibling, 0 replies; 3+ messages in thread
From: Urs Fässler @ 2015-07-07 14:24 UTC (permalink / raw)
To: daniel.vetter, linux-fbdev, linux-kernel, oliver.staebler,
plagnioj, tomi.valkeinen, urs.fassler, geert
New method to return the largest (in number of pixels) logo for a given
resolution.
One use case is for embedded systems when one kernel binary is compiled
but used on different machines (i.e. different device trees) with
different display resolutions.
Signed-off-by: Urs Fässler <urs.fassler@bytesatwork.ch>
---
drivers/video/logo/Kconfig | 7 ++++
drivers/video/logo/logo.c | 86 +++++++++++++++++++++++++++++++++++++---------
include/linux/linux_logo.h | 4 +++
3 files changed, 80 insertions(+), 17 deletions(-)
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 0037104..72bd185 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -15,6 +15,13 @@ config FB_LOGO_EXTRA
depends on FB=y
default y if SPU_BASE
+config FB_LOGO_LARGEST
+ bool "Use largest"
+ default n
+ help
+ Returns the largest available bootup logo that fits the given
+ resolution.
+
config LOGO_LINUX_MONO
bool "Standard black and white Linux logo"
default y
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index 10fbfd8..1b0d4c5 100644
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -36,11 +36,55 @@ static int __init fb_logo_late_init(void)
late_initcall(fb_logo_late_init);
+#ifdef CONFIG_FB_LOGO_LARGEST
+bool fb_logo_valid(const struct linux_logo *logo, unsigned int width,
+ unsigned int height)
+{
+ if (!logo)
+ return false;
+ if (logo->width > width)
+ return false;
+ if (logo->height > height)
+ return false;
+
+ return true;
+}
+
+const struct linux_logo * __init_refok fb_logo_larger(
+ const struct linux_logo *logo1, const struct linux_logo *logo2,
+ unsigned int width, unsigned int height)
+{
+ bool logo1_valid;
+ bool logo2_valid;
+
+ if (!width || !height)
+ return logo1;
+
+ logo1_valid = fb_logo_valid(logo1, width, height);
+ logo2_valid = fb_logo_valid(logo2, width, height);
+
+ if (!logo1_valid && !logo2_valid)
+ return NULL;
+ if (logo1_valid && !logo2_valid)
+ return logo1;
+ if (!logo1_valid && logo2_valid)
+ return logo2;
+
+ if (logo1->width*logo1->height > logo2->width*logo2->height)
+ return logo1;
+ else
+ return logo2;
+}
+#else
+#define fb_logo_larger(logo1, logo2, w, h) (logo1)
+#endif
+
/* logo's are marked __initdata. Use __init_refok to tell
* modpost that it is intended that this function uses data
* marked __initdata.
*/
-const struct linux_logo * __init_refok fb_find_logo(int depth)
+const struct linux_logo * __init_refok fb_find_logo_largest(int depth,
+ unsigned int w, unsigned int h)
{
const struct linux_logo *logo = NULL;
@@ -50,68 +94,76 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
if (depth >= 1) {
#ifdef CONFIG_LOGO_LINUX_MONO
/* Generic Linux logo */
- logo = &logo_linux_mono;
+ logo = fb_logo_larger(&logo_linux_mono, logo, w, h);
#endif
#ifdef CONFIG_LOGO_SUPERH_MONO
/* SuperH Linux logo */
- logo = &logo_superh_mono;
+ logo = fb_logo_larger(&logo_superh_mono, logo, w, h);
#endif
}
-
+
if (depth >= 4) {
#ifdef CONFIG_LOGO_LINUX_VGA16
/* Generic Linux logo */
- logo = &logo_linux_vga16;
+ logo = fb_logo_larger(&logo_linux_vga16, logo, w, h);
#endif
#ifdef CONFIG_LOGO_BLACKFIN_VGA16
/* Blackfin processor logo */
- logo = &logo_blackfin_vga16;
+ logo = fb_logo_larger(&logo_blackfin_vga16, logo, w, h);
#endif
#ifdef CONFIG_LOGO_SUPERH_VGA16
/* SuperH Linux logo */
- logo = &logo_superh_vga16;
+ logo = fb_logo_larger(&logo_superh_vga16, logo, w, h);
#endif
}
-
+
if (depth >= 8) {
#ifdef CONFIG_LOGO_LINUX_CLUT224
/* Generic Linux logo */
- logo = &logo_linux_clut224;
+ logo = fb_logo_larger(&logo_linux_clut224, logo, w, h);
#endif
#ifdef CONFIG_LOGO_BLACKFIN_CLUT224
/* Blackfin Linux logo */
- logo = &logo_blackfin_clut224;
+ logo = fb_logo_larger(&logo_blackfin_clut224, logo, w, h);
#endif
#ifdef CONFIG_LOGO_DEC_CLUT224
/* DEC Linux logo on MIPS/MIPS64 or ALPHA */
- logo = &logo_dec_clut224;
+ logo = fb_logo_larger(&logo_dec_clut224, logo, w, h);
#endif
#ifdef CONFIG_LOGO_MAC_CLUT224
/* Macintosh Linux logo on m68k */
if (MACH_IS_MAC)
- logo = &logo_mac_clut224;
+ logo = fb_logo_larger(&logo_mac_clut224, logo, w, h);
#endif
#ifdef CONFIG_LOGO_PARISC_CLUT224
/* PA-RISC Linux logo */
- logo = &logo_parisc_clut224;
+ logo = fb_logo_larger(&logo_parisc_clut224, logo, w, h);
#endif
#ifdef CONFIG_LOGO_SGI_CLUT224
/* SGI Linux logo on MIPS/MIPS64 */
- logo = &logo_sgi_clut224;
+ logo = fb_logo_larger(&logo_sgi_clut224, logo, w, h);
#endif
#ifdef CONFIG_LOGO_SUN_CLUT224
/* Sun Linux logo */
- logo = &logo_sun_clut224;
+ logo = fb_logo_larger(&logo_sun_clut224, logo, w, h);
#endif
#ifdef CONFIG_LOGO_SUPERH_CLUT224
/* SuperH Linux logo */
- logo = &logo_superh_clut224;
+ logo = fb_logo_larger(&logo_superh_clut224, logo, w, h);
#endif
#ifdef CONFIG_LOGO_M32R_CLUT224
/* M32R Linux logo */
- logo = &logo_m32r_clut224;
+ logo = fb_logo_larger(&logo_m32r_clut224, logo, w, h);
#endif
}
return logo;
}
+#ifdef CONFIG_FB_LOGO_LARGEST
+EXPORT_SYMBOL_GPL(fb_find_logo_largest);
+#endif
+
+const struct linux_logo * __init_refok fb_find_logo(int depth)
+{
+ return fb_find_logo_largest(depth, 0, 0);
+}
EXPORT_SYMBOL_GPL(fb_find_logo);
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
index ca5bd91..f497e97 100644
--- a/include/linux/linux_logo.h
+++ b/include/linux/linux_logo.h
@@ -49,6 +49,10 @@ extern const struct linux_logo logo_m32r_clut224;
extern const struct linux_logo logo_spe_clut224;
extern const struct linux_logo *fb_find_logo(int depth);
+#ifdef CONFIG_FB_LOGO_LARGEST
+extern const struct linux_logo *fb_find_logo_largest(int depth,
+ unsigned int width, unsigned int height);
+#endif
#ifdef CONFIG_FB_LOGO_EXTRA
extern void fb_append_extra_logo(const struct linux_logo *logo,
unsigned int n);
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] fbdev: use largest logo if possible
2015-07-07 14:24 [PATCH 0/2 v2] video/logo: add option to return largest logo for a given resolution Urs Fässler
2015-07-07 14:24 ` [PATCH 1/2] logo: " Urs Fässler
@ 2015-07-07 14:24 ` Urs Fässler
1 sibling, 0 replies; 3+ messages in thread
From: Urs Fässler @ 2015-07-07 14:24 UTC (permalink / raw)
To: daniel.vetter, linux-fbdev, linux-kernel, oliver.staebler,
plagnioj, tomi.valkeinen, urs.fassler, geert
If CONFIG_FB_LOGO_LARGEST is set, fbdev uses the largest boot logo to
display.
Signed-off-by: Urs Fässler <urs.fassler@bytesatwork.ch>
---
drivers/video/fbdev/core/fbmem.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 0705d88..319f168 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -595,7 +595,7 @@ static inline int fb_show_extra_logos(struct fb_info *info, int y, int rotate)
int fb_prepare_logo(struct fb_info *info, int rotate)
{
int depth = fb_get_color_depth(&info->var, &info->fix);
- unsigned int yres;
+ unsigned int xres, yres;
memset(&fb_logo, 0, sizeof(struct logo_data));
@@ -616,18 +616,25 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
depth = 4;
}
- /* Return if no suitable logo was found */
+ if (rotate = FB_ROTATE_UR || rotate = FB_ROTATE_UD) {
+ xres = info->var.xres;
+ yres = info->var.yres;
+ } else {
+ xres = info->var.yres;
+ yres = info->var.xres;
+ }
+
+#ifdef CONFIG_FB_LOGO_LARGEST
+ fb_logo.logo = fb_find_logo_largest(depth, xres, yres);
+#else
fb_logo.logo = fb_find_logo(depth);
+#endif
+ /* Return if no suitable logo was found */
if (!fb_logo.logo) {
return 0;
}
- if (rotate = FB_ROTATE_UR || rotate = FB_ROTATE_UD)
- yres = info->var.yres;
- else
- yres = info->var.xres;
-
if (fb_logo.logo->height > yres) {
fb_logo.logo = NULL;
return 0;
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread