From 8a2cb2e256e04fe9d1ca5d51e18f7bd20cbf1eec Mon Sep 17 00:00:00 2001
From: chenli <chenli@rock-chips.com>
Date: Wed, 17 Aug 2011 14:46:06 +0800
Subject: [PATCH] rk29-ipp:Add the support of two cases of up-scaling: 1.
 128*128->480*800, YUV420 2. 176*144->480*800, YUV420

---
 drivers/staging/rk29/ipp/rk29-ipp.c | 65 +++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/rk29/ipp/rk29-ipp.c b/drivers/staging/rk29/ipp/rk29-ipp.c
index f5bd523318ae..a6fea1250ab6 100755
--- a/drivers/staging/rk29/ipp/rk29-ipp.c
+++ b/drivers/staging/rk29/ipp/rk29-ipp.c
@@ -794,9 +794,15 @@ int ipp_blit(const struct rk29_ipp_req *req)
 
 		}
 
-		if(!((req->src0.fmt != IPP_Y_CBCR_H2V1)&&(req->src0.w == 176)&&(req->src0.h == 144)&&(req->dst0.w == 480)&&(req->dst0.h == 800)))
+		/*only support 1/2 to 4 times scaling,but two cases can pass
+		1.176*144->480*800, YUV420 
+		2.128*128->480*800, YUV420
+		*/
+		if(!((req->src0.fmt == IPP_Y_CBCR_H2V2)&&
+			(((req->src0.w == 176)&&(req->src0.h == 144))||((req->src0.w == 128)&&(req->src0.h == 128)))&&
+			((req->dst0.w == 480)&&(req->dst0.h == 800))))	
 		{	
-			//only support 1/2 to 4 times scaling,but 176*144->480*800 can pass
+			
 			if(post_scale_w<0x3ff || post_scale_w>0x1fff || post_scale_h<0x400 || post_scale_h>0x2000 )
 			{
 				printk("invalid post_scale para!\n");
@@ -1269,21 +1275,21 @@ uint32_t size = 8*1024*1024;
 		
 		ipp_req.src0.YrgbMst = src_addr;
 		ipp_req.src0.CbrMst = src_addr + size;
-		ipp_req.src0.w = 480;
-		ipp_req.src0.h = 320;
+		ipp_req.src0.w = 128;
+		ipp_req.src0.h = 128;
 		ipp_req.src0.fmt = IPP_Y_CBCR_H2V2;
 		
 		ipp_req.dst0.YrgbMst = dst_addr;
 		ipp_req.dst0.CbrMst = dst_addr + size;
-		ipp_req.dst0.w = 240;
-		ipp_req.dst0.h = 160;
+		ipp_req.dst0.w = 480;
+		ipp_req.dst0.h = 800;
 	
-		ipp_req.src_vir_w = 480;
-		ipp_req.dst_vir_w = 240;
+		ipp_req.src_vir_w = 128;
+		ipp_req.dst_vir_w = 480;
 		ipp_req.timeout = 100;
 		ipp_req.flag = IPP_ROT_0;
 		
-		ipp_req.deinterlace_enable =1;
+		ipp_req.deinterlace_enable =0;
 		ipp_req.deinterlace_para0 = 16;
 		ipp_req.deinterlace_para1 = 16;
 		ipp_req.deinterlace_para2 = 0;
@@ -1291,11 +1297,13 @@ uint32_t size = 8*1024*1024;
 		ipp_req.complete = ipp_test_complete;
 
 		/*0 test whether IPP_CONFIG is set correctly*/
+		/*
 		ipp_blit_sync(&ipp_req);
 		ipp_req.dst0.w = 480;
 		ipp_req.dst0.h = 320;
 		ipp_req.dst_vir_w = 480;
 		ipp_blit_sync(&ipp_req);
+		*/
 		
 		/*1 test ipp_blit_sync*/
 		/*
@@ -1407,6 +1415,45 @@ uint32_t size = 8*1024*1024;
 		while(ret>0);
 */
 
+		/*8 test special up scaling*/
+		ipp_req.src0.fmt = IPP_Y_CBCR_H2V2;
+		ipp_req.src0.w = 128;
+		ipp_req.src0.h = 128;
+		ipp_req.dst0.w = 480;
+		ipp_req.dst0.h = 800;
+		ipp_req.src_vir_w = 128;
+		ipp_req.dst_vir_w = 480;
+		ret = -1;
+		ret = ipp_blit_sync(&ipp_req);
+		printk("128x128->480x800: %d \n",ret);
+
+		ipp_req.src0.w = 160;
+		ipp_req.src0.h = 160;
+		ipp_req.src_vir_w = 160;
+		ret = -1;
+		ret = ipp_blit_sync(&ipp_req);
+		printk("160x160->480x800: %d \n",ret);
+
+		ipp_req.src0.w = 176;
+		ipp_req.src0.h = 144;
+		ipp_req.src_vir_w = 176;
+		ret = -1;
+		ret = ipp_blit_sync(&ipp_req);
+		printk("176x144->480x800: %d \n",ret);
+
+		ipp_req.src0.fmt = IPP_Y_CBCR_H2V1;
+		ret = -1;
+		ret = ipp_blit_sync(&ipp_req);
+		printk("fmt:422 176x144->480x800 : %d \n",ret);
+
+		ipp_req.src0.fmt = IPP_Y_CBCR_H2V2;
+		ipp_req.dst0.w = 800;
+		ipp_req.dst0.h = 480;
+		ipp_req.dst_vir_w = 800;
+		ret = -1;
+		ret = ipp_blit_sync(&ipp_req);
+		printk("176x144->800x480: %d \n",ret);
+
 		
 		free_pages(srcY, 9);
 //test deinterlace
-- 
2.34.1