Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "msm: isp: Fix offline isp"

This commit is contained in:
Linux Build Service Account 2015-11-08 11:29:32 -08:00 committed by Gerrit - the friendly Code Review server
parent ce8af74672 2d9584c8a8
commit 9bc83f3edf
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
View File

@ -1083,6 +1083,9 @@ static int msm_vfe40_start_fetch_engine(struct vfe_device *vfe_dev,
struct msm_isp_buffer *buf = NULL;
struct msm_vfe_fetch_eng_start *fe_cfg = arg;
struct msm_isp_buffer_mapped_info mapped_info;
struct dual_vfe_resource *dual_vfe_res = NULL;
dual_vfe_res = vfe_dev->common_data->dual_vfe_res;
if (vfe_dev->fetch_engine_info.is_busy == 1) {
pr_err("%s: fetch engine busy\n", __func__);
@ -1124,7 +1127,10 @@ static int msm_vfe40_start_fetch_engine(struct vfe_device *vfe_dev,
vfe_dev->fetch_engine_info.is_busy = 1;
msm_camera_io_w(mapped_info.paddr, vfe_dev->vfe_base + 0x228);
vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id =
dual_vfe_res->axi_data[!vfe_dev->pdev->id]->
src_info[VFE_PIX_0].frame_id;
msm_camera_io_w_mb(0x1, vfe_dev->vfe_base + 0x378);
msm_camera_io_w_mb(0x10000, vfe_dev->vfe_base + 0x4C);
msm_camera_io_w_mb(0x20000, vfe_dev->vfe_base + 0x4C);

4
include/media/msmb_isp.h
View File

@ -844,9 +844,9 @@ struct msm_isp_set_stats_ab {
_IOWR('V', BASE_VIDIOC_PRIVATE+23, struct msm_isp_set_stats_ab)
#define VIDIOC_MSM_ISP_MAP_BUF_START_FE \
_IOWR('V', BASE_VIDIOC_PRIVATE+21, struct msm_vfe_fetch_eng_start)
_IOWR('V', BASE_VIDIOC_PRIVATE+24, struct msm_vfe_fetch_eng_start)
#define VIDIOC_MSM_ISP_UNMAP_BUF \
_IOWR('V', BASE_VIDIOC_PRIVATE+22, struct msm_isp_unmap_buf_req)
_IOWR('V', BASE_VIDIOC_PRIVATE+25, struct msm_isp_unmap_buf_req)
#endif /* __MSMB_ISP__ */