Merge "msm: camera: Fix framedrop pattern and period"

This commit is contained in:
Linux Build Service Account 2017-10-06 13:42:29 -07:00 committed by Gerrit - the friendly Code Review server
commit df42ac7d5c

View file

@ -674,6 +674,7 @@ void msm_isp_process_reg_upd_epoch_irq(struct vfe_device *vfe_dev,
void msm_isp_reset_framedrop(struct vfe_device *vfe_dev, void msm_isp_reset_framedrop(struct vfe_device *vfe_dev,
struct msm_vfe_axi_stream *stream_info) struct msm_vfe_axi_stream *stream_info)
{ {
uint32_t framedrop_period = 0;
stream_info->runtime_num_burst_capture = stream_info->num_burst_capture; stream_info->runtime_num_burst_capture = stream_info->num_burst_capture;
/** /**
@ -682,9 +683,15 @@ void msm_isp_reset_framedrop(struct vfe_device *vfe_dev,
* by the request frame api * by the request frame api
*/ */
if (!stream_info->controllable_output) { if (!stream_info->controllable_output) {
stream_info->current_framedrop_period = framedrop_period =
msm_isp_get_framedrop_period( msm_isp_get_framedrop_period(
stream_info->frame_skip_pattern); stream_info->frame_skip_pattern);
if (stream_info->frame_skip_pattern == SKIP_ALL)
stream_info->current_framedrop_period =
MSM_VFE_STREAM_STOP_PERIOD;
else
stream_info->current_framedrop_period =
framedrop_period;
} }
msm_isp_cfg_framedrop_reg(stream_info); msm_isp_cfg_framedrop_reg(stream_info);