evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: camera: isp: Use the frame id from correct source"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-20 16:10:22 -07:00 • committed by Gerrit - the friendly Code Review server
commit 661a45ee18
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
View file

@ -3432,22 +3432,21 @@ static int msm_isp_request_frame(struct vfe_device *vfe_dev,
/* /*
* If frame_id = 1 then no eof check is needed * If frame_id = 1 then no eof check is needed
*/ */
if (vfe_dev->axi_data.src_info[VFE_PIX_0].active && if (vfe_dev->axi_data.src_info[frame_src].active &&
vfe_dev->axi_data.src_info[VFE_PIX_0].accept_frame == false) { frame_src == VFE_PIX_0 &&
vfe_dev->axi_data.src_info[frame_src].accept_frame == false) {
pr_debug("%s:%d invalid time to request frame %d\n", pr_debug("%s:%d invalid time to request frame %d\n",
__func__, __LINE__, frame_id); __func__, __LINE__, frame_id);
goto error; goto error;
} }
if ((vfe_dev->axi_data.src_info[VFE_PIX_0].active && (frame_id != if ((vfe_dev->axi_data.src_info[frame_src].active && (frame_id !=
vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id + vfe_dev->
axi_data.src_info[VFE_PIX_0].sof_counter_step)) ||
((!vfe_dev->axi_data.src_info[VFE_PIX_0].active) && (frame_id !=
vfe_dev->axi_data.src_info[frame_src].frame_id + vfe_dev-> vfe_dev->axi_data.src_info[frame_src].frame_id + vfe_dev->
axi_data.src_info[frame_src].sof_counter_step))) { axi_data.src_info[VFE_PIX_0].sof_counter_step)) ||
((!vfe_dev->axi_data.src_info[frame_src].active))) {
pr_debug("%s:%d invalid frame id %d cur frame id %d pix %d\n", pr_debug("%s:%d invalid frame id %d cur frame id %d pix %d\n",
__func__, __LINE__, frame_id, __func__, __LINE__, frame_id,
vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id, vfe_dev->axi_data.src_info[frame_src].frame_id,
vfe_dev->axi_data.src_info[VFE_PIX_0].active); vfe_dev->axi_data.src_info[frame_src].active);
goto error; goto error;
} }
if (stream_info->undelivered_request_cnt >= MAX_BUFFERS_IN_HW) { if (stream_info->undelivered_request_cnt >= MAX_BUFFERS_IN_HW) {