From: Xinyu Chen <xinyu.chen@freescale.com>
Date: Tue, 13 Dec 2011 07:30:42 +0000 (+0800)
Subject: ENGR00170145-2 ipuv3 fb: reserve overlay fb buffer with valid resource
X-Git-Tag: v3.0.35-fsl~1775
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f6335f055923107c508b60a4a53477910ddd0536;p=karo-tx-linux.git

ENGR00170145-2 ipuv3 fb: reserve overlay fb buffer with valid resource

Reserve the overlay fb triple buffer when we have a valid
resource for start and end.
Clear the GB fb buffers when we reserve memory for it.

Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
---

diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c
index ba652d73028c..46cc9f76a8bf 100644
--- a/drivers/video/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc/mxc_ipuv3_fb.c
@@ -1874,7 +1874,7 @@ static void mxcfb_unregister(struct fb_info *fbi)
 }
 
 static int mxcfb_setup_overlay(struct platform_device *pdev,
-		struct fb_info *fbi_bg)
+		struct fb_info *fbi_bg, struct resource *res)
 {
 	struct fb_info *ovfbi;
 	struct mxcfb_info *mxcfbi_bg = (struct mxcfb_info *)fbi_bg->par;
@@ -1907,6 +1907,14 @@ static int mxcfb_setup_overlay(struct platform_device *pdev,
 	ovfbi->var.xres = 240;
 	ovfbi->var.yres = 320;
 
+	if (res && res->end) {
+		ovfbi->fix.smem_len = res->end - res->start + 1;
+		ovfbi->fix.smem_start = res->start;
+		ovfbi->screen_base = ioremap(
+					ovfbi->fix.smem_start,
+					ovfbi->fix.smem_len);
+	}
+
 	ret = mxcfb_register(ovfbi);
 	if (ret < 0)
 		goto register_ov_failed;
@@ -1995,6 +2003,7 @@ static int mxcfb_probe(struct platform_device *pdev)
 		fbi->fix.smem_len = res->end - res->start + 1;
 		fbi->fix.smem_start = res->start;
 		fbi->screen_base = ioremap(fbi->fix.smem_start, fbi->fix.smem_len);
+		memset(fbi->screen_base, 0, fbi->fix.smem_len);
 	}
 
 	mxcfbi->ipu = ipu_get_soc(mxcfbi->ipu_id);
@@ -2018,7 +2027,9 @@ static int mxcfb_probe(struct platform_device *pdev)
 		if (ret < 0)
 			goto mxcfb_register_failed;
 
-		ret = mxcfb_setup_overlay(pdev, fbi);
+		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+		ret = mxcfb_setup_overlay(pdev, fbi, res);
+
 		if (ret < 0) {
 			mxcfb_unregister(fbi);
 			goto mxcfb_setupoverlay_failed;