diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-20 02:25:25 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-20 02:25:24 -0800 |
| commit | a6253cc1ad8dfb3f9036d374f151babcbe294b96 (patch) | |
| tree | bb9c871c2744396230ae3a28c508e7f825f6dbc4 | |
| parent | ff7554df6b5f6513d367a42a359a1a22eae4ebf0 (diff) | |
| parent | 4d5520332766e5aa079f20d37d625be9a8b7f728 (diff) | |
Merge "msm: camera: isp: Fix frame drop pattern"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c index 13364905b644..79b45b6678b0 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c @@ -596,7 +596,8 @@ static int msm_isp_composite_irq(struct vfe_device *vfe_dev, * * Returns void */ -static void msm_isp_update_framedrop_reg(struct msm_vfe_axi_stream *stream_info) +static void msm_isp_update_framedrop_reg(struct msm_vfe_axi_stream *stream_info, + uint32_t drop_reconfig) { if (stream_info->stream_type == BURST_STREAM) { if (stream_info->runtime_num_burst_capture == 0 || @@ -606,7 +607,8 @@ static void msm_isp_update_framedrop_reg(struct msm_vfe_axi_stream *stream_info) MSM_VFE_STREAM_STOP_PERIOD; } - if (stream_info->undelivered_request_cnt > 0) + if (stream_info->undelivered_request_cnt > 0 && + drop_reconfig != 1) stream_info->current_framedrop_period = MSM_VFE_STREAM_STOP_PERIOD; @@ -661,7 +663,8 @@ void msm_isp_process_reg_upd_epoch_irq(struct vfe_device *vfe_dev, break; case MSM_ISP_COMP_IRQ_EPOCH: if (stream_info->state == ACTIVE) - msm_isp_update_framedrop_reg(stream_info); + msm_isp_update_framedrop_reg(stream_info, + vfe_dev->isp_page->drop_reconfig); break; default: WARN(1, "Invalid irq %d\n", irq); |