From: ywj <ywj@rock-chips.com>
Date: Sat, 2 Feb 2013 02:21:21 +0000 (+0800)
Subject: bmp Full resolution support for factoryTool 4.0
X-Git-Tag: firefly_0821_release~7642
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a8c373dc42b52dc87e54ab04191201505e8ee335;p=firefly-linux-kernel-4.4.55.git

bmp Full resolution support for factoryTool 4.0
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index d632d8b5cefe..ba3a2643806a 100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -1096,15 +1096,11 @@ static void fb_show_bmp_logo(struct fb_info *info, int rotate)
 	unsigned char *src=bmp_logo->data;
 	unsigned char *dst=info->screen_base;
 	int i;
-
-	if(bmp_logo->width>info->var.xres)
-		bmp_logo->width=info->var.xres;
-
-	if(bmp_logo->height>info->var.yres)
-		bmp_logo->height=info->var.yres;
-
-	for(i=0;i<bmp_logo->height;i++)
-		memcpy(dst+info->var.xres*i*4, src+bmp_logo->width*i*4, bmp_logo->width*4);
+	unsigned int Needwidth=(*(src-24)<<8)|(*(src-23));
+	unsigned int Needheight=(*(src-22)<<8)|(*(src-21));
+		
+	for(i=0;i<Needheight;i++)
+		memcpy(dst+info->var.xres*i*4, src+bmp_logo->width*i*4, Needwidth*4);
 	
 }
 #endif