Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932175AbbGGOYg (ORCPT ); Tue, 7 Jul 2015 10:24:36 -0400 Received: from bytesatwork.ch ([91.135.72.15]:49390 "EHLO bytesatwork.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757727AbbGGOYV (ORCPT ); Tue, 7 Jul 2015 10:24:21 -0400 From: =?UTF-8?q?Urs=20F=C3=A4ssler?= To: daniel.vetter@ffwll.ch, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, oliver.staebler@bytesatwork.ch, plagnioj@jcrosoft.com, tomi.valkeinen@ti.com, urs.fassler@bytesatwork.ch, geert@linux-m68k.org Subject: [PATCH 2/2] fbdev: use largest logo if possible Date: Tue, 7 Jul 2015 16:24:12 +0200 Message-Id: <1436279052-17237-3-git-send-email-urs.fassler@bytesatwork.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436279052-17237-1-git-send-email-urs.fassler@bytesatwork.ch> References: <1436279052-17237-1-git-send-email-urs.fassler@bytesatwork.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1756 Lines: 61 If CONFIG_FB_LOGO_LARGEST is set, fbdev uses the largest boot logo to display. Signed-off-by: Urs Fässler --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/