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: camera: fix update frame drop pattern"

This commit is contained in:
Linux Build Service Account 2014-02-10 05:34:35 -08:00 committed by Gerrit - the friendly Code Review server
parent 97458c60fd 3427eab343
commit 95b0ca21a2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
View File

@ -1347,7 +1347,10 @@ int msm_isp_update_axi_stream(struct vfe_device *vfe_dev, void *arg)
return -EINVAL;
}
if (stream_info->state == ACTIVE &&
stream_info->stream_type == BURST_STREAM) {
stream_info->stream_type == BURST_STREAM &&
(1 != update_cmd->num_streams ||
UPDATE_STREAM_FRAMEDROP_PATTERN !=
update_cmd->update_type)) {
pr_err("%s: Cannot update active burst stream\n",
__func__);
return -EINVAL;
@ -1374,7 +1377,10 @@ int msm_isp_update_axi_stream(struct vfe_device *vfe_dev, void *arg)
msm_isp_get_framedrop_period(
update_info->skip_pattern);
stream_info->runtime_init_frame_drop = 0;
stream_info->framedrop_pattern = 0x1;
if (update_info->skip_pattern == SKIP_ALL)
stream_info->framedrop_pattern = 0x0;
else
stream_info->framedrop_pattern = 0x1;
stream_info->framedrop_period = framedrop_period - 1;
vfe_dev->hw_info->vfe_ops.axi_ops.
cfg_framedrop(vfe_dev, stream_info);