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

msm: camera: isp: Fix framedrop reporting

Browse source 
This change fixed the framedrop reporting that causes the CTS
test failure. The failure is due to the wrong frame id is used to
report the framedrop. This change will change the framedrop
report logic so that the correct frame id is used.

Change-Id: I5b219ed570b81a7fd6a97be46977cafd3e452492
Signed-off-by: Jing Zhou <jzhou70@codeaurora.org>
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
This commit is contained in:
Jing Zhou 2016-05-24 16:37:11 -07:00 • committed by Kyle Yan
parent 5fbfb727e3
commit b5bb5c7d6f
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1533,12 +1533,8 @@ static struct msm_isp_buffer *msm_isp_get_stream_buffer(
ISP_EVENT_BUF_FATAL_ERROR); ISP_EVENT_BUF_FATAL_ERROR);
return buf; return buf;
} }
if (rc < 0) { if (rc < 0)
vfe_dev->error_info.
stream_framedrop_count[bufq_handle & 0xFF]++;
vfe_dev->error_info.framedrop_flag = 1;
return buf; return buf;
}
if (buf->num_planes != stream_info->num_planes) { if (buf->num_planes != stream_info->num_planes) {
pr_err("%s: Invalid buffer\n", __func__); pr_err("%s: Invalid buffer\n", __func__);
@ -2865,14 +2861,13 @@ static int msm_isp_return_empty_buffer(struct vfe_device *vfe_dev,
msm_isp_halt_send_error(vfe_dev, ISP_EVENT_BUF_FATAL_ERROR); msm_isp_halt_send_error(vfe_dev, ISP_EVENT_BUF_FATAL_ERROR);
return rc; return rc;
} }
if (rc < 0 || buf == NULL) { if (rc < 0 || buf == NULL) {
vfe_dev->error_info. pr_err("Skip framedrop report due to no buffer\n");
stream_framedrop_count[bufq_handle & 0xFF]++;
return rc; return rc;
} }
msm_isp_get_timestamp(&timestamp); msm_isp_get_timestamp(&timestamp);
buf->buf_debug.put_state[buf->buf_debug.put_state_last] = buf->buf_debug.put_state[buf->buf_debug.put_state_last] =
MSM_ISP_BUFFER_STATE_DROP_REG; MSM_ISP_BUFFER_STATE_DROP_REG;
buf->buf_debug.put_state_last ^= 1; buf->buf_debug.put_state_last ^= 1;
@ -2882,7 +2877,7 @@ static int msm_isp_return_empty_buffer(struct vfe_device *vfe_dev,
stream_info->runtime_output_format); stream_info->runtime_output_format);
if (rc == -EFAULT) { if (rc == -EFAULT) {
msm_isp_halt_send_error(vfe_dev, msm_isp_halt_send_error(vfe_dev,
ISP_EVENT_BUF_FATAL_ERROR); ISP_EVENT_BUF_FATAL_ERROR);
return rc; return rc;
} }
@ -3437,6 +3432,12 @@ void msm_isp_process_axi_irq_stream(struct vfe_device *vfe_dev,
} }
if (!done_buf) { if (!done_buf) {
if (stream_info->buf_divert) {
vfe_dev->error_info.stream_framedrop_count[
stream_info->bufq_handle[
VFE_BUF_QUEUE_DEFAULT] & 0xFF]++;
vfe_dev->error_info.framedrop_flag = 1;
}
spin_unlock_irqrestore(&stream_info->lock, flags); spin_unlock_irqrestore(&stream_info->lock, flags);
return; return;
} }