From: ddl <ddl@rock-chips.com>
Date: Mon, 13 Feb 2012 08:46:57 +0000 (+0800)
Subject: camera: ipp memory size turn large when in 3Mega and 2Mega, ov2655 1.3Mega framerate... 
X-Git-Tag: firefly_0821_release~9629
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ece4c831d60fa7df8aea3e9e665866874d6215d2;p=firefly-linux-kernel-4.4.55.git

camera: ipp memory size turn large when in 3Mega and 2Mega, ov2655 1.3Mega framerate switch 12fps for cts
---

diff --git a/arch/arm/mach-rk29/board-rk29-k97.c b/arch/arm/mach-rk29/board-rk29-k97.c
index 39bbfaf2068c..bfcc8592346e 100755
--- a/arch/arm/mach-rk29/board-rk29-k97.c
+++ b/arch/arm/mach-rk29/board-rk29-k97.c
@@ -90,7 +90,7 @@
 #define CONFIG_SENSOR_VGA_FPS_FIXED_0       12504
 #define CONFIG_SENSOR_480P_FPS_FIXED_0      12504
 #define CONFIG_SENSOR_SVGA_FPS_FIXED_0      12504
-#define CONFIG_SENSOR_720P_FPS_FIXED_0      6256
+#define CONFIG_SENSOR_720P_FPS_FIXED_0      12504
 #ifdef CONFIG_SOC_CAMERA_OV9665
 #define CONFIG_SENSOR_1 RK29_CAM_SENSOR_OV9665                      /* front camera sensor */
 #define CONFIG_SENSOR_IIC_ADDR_1            0x60
@@ -124,7 +124,7 @@
 #define CONFIG_SENSOR_VGA_FPS_FIXED_1       12504
 #define CONFIG_SENSOR_480P_FPS_FIXED_1      12504
 #define CONFIG_SENSOR_SVGA_FPS_FIXED_1      12504
-#define CONFIG_SENSOR_720P_FPS_FIXED_1      6256
+#define CONFIG_SENSOR_720P_FPS_FIXED_1      12504
 #endif  //#ifdef CONFIG_VIDEO_RK29
 /*---------------- Camera Sensor Configuration Macro End------------------------*/
 #include "../../../drivers/media/video/rk29_camera.c"
diff --git a/drivers/media/video/ov2655.c b/drivers/media/video/ov2655.c
index 6d7853134ed5..7f7434f52f43 100755
--- a/drivers/media/video/ov2655.c
+++ b/drivers/media/video/ov2655.c
@@ -372,7 +372,7 @@ static struct reginfo sensor_uxga[] =
 static struct reginfo sensor_sxga[] =
 {
     {0x300E, 0x34},
-    {0x3011, 0x01},
+    {0x3011, 0x00},
     {0x3012, 0x00},
     {0x302a, 0x05},
     {0x302b, 0xCB},
diff --git a/drivers/media/video/rk29_camera.c b/drivers/media/video/rk29_camera.c
index e8c4898f4f94..13ee3a968c8c 100755
--- a/drivers/media/video/rk29_camera.c
+++ b/drivers/media/video/rk29_camera.c
@@ -42,10 +42,10 @@
 #define PMEM_CAMIPP_NECESSARY    0x800000
 #elif (PMEM_CAM_FULL_RESOLUTION == 0x300000)
 #define PMEM_CAM_NECESSARY   0xe00000        /* 1280*720*1.5*4(preview) + 4.5M(capture raw) + 3M(jpeg encode output) */
-#define PMEM_CAMIPP_NECESSARY    0x500000
+#define PMEM_CAMIPP_NECESSARY    0x600000
 #elif (PMEM_CAM_FULL_RESOLUTION == 0x200000) /* 1280*720*1.5*4(preview) + 3M(capture raw) + 3M(jpeg encode output) */
 #define PMEM_CAM_NECESSARY   0xc00000
-#define PMEM_CAMIPP_NECESSARY    0x400000
+#define PMEM_CAMIPP_NECESSARY    0x600000
 #elif ((PMEM_CAM_FULL_RESOLUTION == 0x100000) || (PMEM_CAM_FULL_RESOLUTION == 0x130000))
 #define PMEM_CAM_NECESSARY   0x800000        /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */
 #define PMEM_CAMIPP_NECESSARY    0x400000