diff options
| author | Liu Ying <b17645@freescale.com> | 2009-09-16 13:49:49 +0800 |
|---|---|---|
| committer | Liu Ying <b17645@freescale.com> | 2009-09-22 16:15:54 +0800 |
| commit | eaf5028e9bfc08aecb68f83c064ec3adf8a154d6 (patch) | |
| tree | fa021d28f3729a22ae08d53159157b02f2a3d70d | |
| parent | 5f18bdf0c16d281a83db52d4eba977cfb83704d1 (diff) | |
ENGR00116436 IPUv3:camera preview and camera capture can be used simultaneously
PRP_VF and PRP_ENC channels are able to be used at the same time
when their sources are the same.
Signed-off-by: Liu Ying <b17645@freescale.com>
| -rw-r--r-- | drivers/mxc/ipu3/ipu_common.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/mxc/ipu3/ipu_common.c b/drivers/mxc/ipu3/ipu_common.c index 79fc0316fec3..6b18c6befbac 100644 --- a/drivers/mxc/ipu3/ipu_common.c +++ b/drivers/mxc/ipu3/ipu_common.c @@ -399,8 +399,7 @@ int32_t ipu_init_channel(ipu_channel_t channel, ipu_channel_params_t *params) ret = -EINVAL; goto err; } - if ((using_ic_dirct_ch != 0) && - (using_ic_dirct_ch != MEM_PRP_ENC_MEM)) { + if (using_ic_dirct_ch == MEM_VDI_PRP_VF_MEM) { ret = -EINVAL; goto err; } @@ -434,8 +433,7 @@ int32_t ipu_init_channel(ipu_channel_t channel, ipu_channel_params_t *params) ret = -EINVAL; goto err; } - if ((using_ic_dirct_ch != 0) && - (using_ic_dirct_ch != MEM_PRP_VF_MEM)) { + if (using_ic_dirct_ch == MEM_VDI_PRP_VF_MEM) { ret = -EINVAL; goto err; } @@ -477,8 +475,8 @@ int32_t ipu_init_channel(ipu_channel_t channel, ipu_channel_params_t *params) _ipu_ic_init_prpvf(params, false); break; case MEM_VDI_PRP_VF_MEM: - if ((using_ic_dirct_ch != 0) && - (using_ic_dirct_ch != MEM_VDI_PRP_VF_MEM)) { + if ((using_ic_dirct_ch == CSI_PRP_VF_MEM) || + (using_ic_dirct_ch == CSI_PRP_ENC_MEM)) { ret = -EINVAL; goto err; } |