shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera rk30: modify board configs about camera,use ion for default.

Browse Source
This commit is contained in:
root
2012-03-13 17:36:16 +08:00
parent d186635ad2
commit 9c2b7d8337
3 changed files with 92 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm/mach-rk30/board-rk30-sdk.c
View File

@@ -108,11 +108,15 @@
#include "../../../drivers/media/video/rk30_camera.c"
/*---------------- Camera Sensor Macro Define End ---------*/
#define PMEM_CAM_SIZE PMEM_CAM_NECESSARY
//RK30,use ion to allocate mem , set it as 0
#define PMEM_CAM_SIZE 0//PMEM_CAM_NECESSARY
#ifdef CONFIG_VIDEO_RK29_WORK_IPP
#define MEM_CAMIPP_SIZE PMEM_CAMIPP_NECESSARY
#define MEM_CAMIPP_SIZE_CIF_0 PMEM_CAMIPP_NECESSARY_CIF_0
#define MEM_CAMIPP_SIZE_CIF_1 PMEM_CAMIPP_NECESSARY_CIF_0
#else
#define MEM_CAMIPP_SIZE 0
#define MEM_CAMIPP_SIZE_CIF_0 0
#define MEM_CAMIPP_SIZE_CIF_1 0
#endif
/*****************************************************************************************
* camera devices
@@ -195,7 +199,7 @@ static rk_sensor_user_init_data_s rk_init_data_sensor_0 =
.rk_sensor_winseq_size = sizeof(rk_init_data_sensor_winseqreg_0) / sizeof(struct reginfo_t),
};
static rk_sensor_user_init_data_s* rk_init_data_sensor_0_p = &rk_init_data_sensor_0;
static rk_sensor_user_init_data_s* rk_init_data_sensor_0_p = NULL;
static rk_sensor_user_init_data_s* rk_init_data_sensor_1_p = NULL;
#include "../../../drivers/media/video/rk30_camera.c"
@@ -1449,25 +1453,7 @@ static void __init rk30_reserve(void)
resource_fb[2].start = board_mem_reserve_add("fb2",RK30_FB0_MEM_SIZE);
resource_fb[2].end = resource_fb[2].start + RK30_FB0_MEM_SIZE - 1;
#endif
#if (MEM_CAMIPP_SIZE != 0)
#if CONFIG_USE_CIF_0
rk_camera_platform_data.meminfo.name = "camera_ipp_mem_0";
rk_camera_platform_data.meminfo.start = board_mem_reserve_add("camera_ipp_mem_0",MEM_CAMIPP_SIZE);
rk_camera_platform_data.meminfo.size= MEM_CAMIPP_SIZE;
#endif
#if CONFIG_USE_CIF_1
rk_camera_platform_data.meminfo_cif1.name = "camera_ipp_mem_1";
rk_camera_platform_data.meminfo_cif1.start =board_mem_reserve_add("camera_ipp_mem_1",MEM_CAMIPP_SIZE);
rk_camera_platform_data.meminfo_cif1.size= MEM_CAMIPP_SIZE;
#endif
#endif
#if (PMEM_CAM_SIZE != 0)
android_pmem_cam_pdata.start = board_mem_reserve_add("camera_pmem",PMEM_CAM_SIZE);
android_pmem_cam_pdata.size = PMEM_CAM_SIZE;
#endif
rk30_camera_request_reserve_mem();
board_mem_reserved();
}

101
drivers/media/video/rk30_camera.c
View File

@@ -20,8 +20,16 @@
#undef PMEM_SENSOR_FULL_RESOLUTION_0
#define PMEM_SENSOR_FULL_RESOLUTION_0 0x500000
#endif
#if(SENSOR_CIF_BUSID_0 == RK_CAM_PLATFORM_DEV_ID_0)
#define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 PMEM_SENSOR_FULL_RESOLUTION_0
#define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 0
#else
#define PMEM_SENSOR_FULL_RESOLUTION_0 0x00
#define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 PMEM_SENSOR_FULL_RESOLUTION_0
#define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 0
#endif
#else
#define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 0x00
#define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 0x00
#endif
#if (CONFIG_SENSOR_IIC_ADDR_1 != 0x00)
@@ -31,38 +39,63 @@
#undef PMEM_SENSOR_FULL_RESOLUTION_1
#define PMEM_SENSOR_FULL_RESOLUTION_1 0x500000
#endif
#if (SENSOR_CIF_BUSID_1 == RK_CAM_PLATFORM_DEV_ID_0)
#if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 < PMEM_SENSOR_FULL_RESOLUTION_1)
#undef PMEM_SENSOR_FULL_RESOLUTION_CIF_0
#define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 PMEM_SENSOR_FULL_RESOLUTION_1
#endif
#else
#define PMEM_SENSOR_FULL_RESOLUTION_1 0x00
#if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 < PMEM_SENSOR_FULL_RESOLUTION_1)
#undef PMEM_SENSOR_FULL_RESOLUTION_CIF_1
#define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 PMEM_SENSOR_FULL_RESOLUTION_1
#endif
#endif
#endif
#if (PMEM_SENSOR_FULL_RESOLUTION_0 > PMEM_SENSOR_FULL_RESOLUTION_1)
#define PMEM_CAM_FULL_RESOLUTION PMEM_SENSOR_FULL_RESOLUTION_0
#else
#define PMEM_CAM_FULL_RESOLUTION PMEM_SENSOR_FULL_RESOLUTION_1
#endif
#if (PMEM_CAM_FULL_RESOLUTION == 0x500000)
//CIF 0
#if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x500000)
#define PMEM_CAM_NECESSARY 0x1400000 /* 1280*720*1.5*4(preview) + 7.5M(capture raw) + 4M(jpeg encode output) */
#define PMEM_CAMIPP_NECESSARY 0x800000
#elif (PMEM_CAM_FULL_RESOLUTION == 0x300000)
#define PMEM_CAMIPP_NECESSARY_CIF0 0x800000
#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 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
#elif (PMEM_CAM_FULL_RESOLUTION == 0x200000) /* 1280*720*1.5*4(preview) + 3M(capture raw) + 3M(jpeg encode output) */
#define PMEM_CAMIPP_NECESSARY_CIF_0 0x500000
#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x200000) /* 1280*720*1.5*4(preview) + 3M(capture raw) + 3M(jpeg encode output) */
#define PMEM_CAM_NECESSARY 0xc00000
#define PMEM_CAMIPP_NECESSARY 0x400000
#elif ((PMEM_CAM_FULL_RESOLUTION == 0x100000) || (PMEM_CAM_FULL_RESOLUTION == 0x130000))
#define PMEM_CAMIPP_NECESSARY_CIF_0 0x400000
#elif ((PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x100000) || (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x130000))
#define PMEM_CAM_NECESSARY 0x800000 /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */
#define PMEM_CAMIPP_NECESSARY 0x400000
#elif (PMEM_CAM_FULL_RESOLUTION == 0x30000)
#define PMEM_CAMIPP_NECESSARY_CIF_0 0x400000
#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x30000)
#define PMEM_CAM_NECESSARY 0x400000 /* 640*480*1.5*4(preview) + 1M(capture raw) + 1M(jpeg encode output) */
#define PMEM_CAMIPP_NECESSARY 0x400000
#define PMEM_CAMIPP_NECESSARY_CIF_0 0x400000
#else
#define PMEM_CAM_NECESSARY 0x1200000
#define PMEM_CAMIPP_NECESSARY 0x800000
#define PMEM_CAMIPP_NECESSARY_CIF_0 0x800000
#endif
//CIF 1
#if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x500000)
#define PMEM_CAM_NECESSARY 0x1400000 /* 1280*720*1.5*4(preview) + 7.5M(capture raw) + 4M(jpeg encode output) */
#define PMEM_CAMIPP_NECESSARY_CIF_1 0x800000
#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x300000)
#define PMEM_CAM_NECESSARY 0xe00000 /* 1280*720*1.5*4(preview) + 4.5M(capture raw) + 3M(jpeg encode output) */
#define PMEM_CAMIPP_NECESSARY_CIF_1 0x500000
#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_1== 0x200000) /* 1280*720*1.5*4(preview) + 3M(capture raw) + 3M(jpeg encode output) */
#define PMEM_CAM_NECESSARY 0xc00000
#define PMEM_CAMIPP_NECESSARY_CIF_1 0x400000
#elif ((PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x100000) || (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x130000))
#define PMEM_CAM_NECESSARY 0x800000 /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */
#define PMEM_CAMIPP_NECESSARY_CIF_1 0x400000
#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x30000)
#define PMEM_CAM_NECESSARY 0x400000 /* 640*480*1.5*4(preview) + 1M(capture raw) + 1M(jpeg encode output) */
#define PMEM_CAMIPP_NECESSARY_CIF_1 0x400000
#else
#define PMEM_CAM_NECESSARY 0x1200000
#define PMEM_CAMIPP_NECESSARY_CIF_1 0x800000
#endif
/*---------------- Camera Sensor Fixed Macro End ------------------------*/
#else //#ifdef CONFIG_VIDEO_RK
#define PMEM_CAM_NECESSARY 0x00000000
#else //#ifdef CONFIG_VIDEO_RK
#define PMEM_CAM_NECESSARY 0x00000000
#endif
#else // #ifdef PMEM_CAM_SIZE
@@ -1681,8 +1714,30 @@ static struct android_pmem_platform_data android_pmem_cam_pdata = {
.platform_data = &android_pmem_cam_pdata,
},
};
static void rk30_camera_request_reserve_mem(void)
{
#if (MEM_CAMIPP_SIZE_CIF_0 != 0)
#if CONFIG_USE_CIF_0
rk_camera_platform_data.meminfo.name = "camera_ipp_mem_0";
rk_camera_platform_data.meminfo.start = board_mem_reserve_add("camera_ipp_mem_0",MEM_CAMIPP_SIZE_CIF_0);
rk_camera_platform_data.meminfo.size= MEM_CAMIPP_SIZE_CIF_0;
#endif
#endif
static void rk_register_camera_devices(void)
#if (MEM_CAMIPP_SIZE_CIF_1 != 0)
#if CONFIG_USE_CIF_1
rk_camera_platform_data.meminfo_cif1.name = "camera_ipp_mem_1";
rk_camera_platform_data.meminfo_cif1.start =board_mem_reserve_add("camera_ipp_mem_1",MEM_CAMIPP_SIZE_CIF_1);
rk_camera_platform_data.meminfo_cif1.size= MEM_CAMIPP_SIZE_CIF_1;
#endif
#endif
#if (PMEM_CAM_SIZE != 0)
android_pmem_cam_pdata.start = board_mem_reserve_add("camera_pmem",PMEM_CAM_SIZE);
android_pmem_cam_pdata.size = PMEM_CAM_SIZE;
#endif
}
static int rk_register_camera_devices(void)
{
rk_init_camera_plateform_data();
#if CONFIG_USE_CIF_0
@@ -1697,7 +1752,9 @@ static void rk_register_camera_devices(void)
platform_device_register(&rk_soc_camera_pdrv_1);
if(((struct android_pmem_platform_data*)(android_pmem_cam_device.dev.platform_data))->size)
platform_device_register(&android_pmem_cam_device);
return 0;
}
module_init(rk_register_camera_devices);
#endif

8
drivers/media/video/rk30_camera_oneframe.c
View File

@@ -1359,10 +1359,10 @@ static int rk_camera_set_fmt(struct soc_camera_device *icd,
goto RK_CAMERA_SET_FMT_END;
}
//need crop ?
if(1/*(mf.width/mf.height) != (usr_w/usr_h)*/){
ratio = ((mf.width/usr_w) >= (mf.height/usr_h))?(mf.height/usr_h):(mf.width/usr_w);
pcdev->host_width = ratio*usr_w;
pcdev->host_height = ratio*usr_h;
if((mf.width*10/mf.height) != (usr_w*10/usr_h)){
ratio = ((mf.width*10/usr_w) >= (mf.height*10/usr_h))?(mf.height*10/usr_h):(mf.width*10/usr_w);
pcdev->host_width = ratio*usr_w/10;
pcdev->host_height = ratio*usr_h/10;
printk("ratio = %d ,host:%d*%d\n",ratio,pcdev->host_width,pcdev->host_height);
}
else{ // needn't crop ,just scaled by ipp