summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorchiz <chiz@codeaurora.org>2015-12-01 13:22:48 +0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:21:36 -0700
commitf87adb2565c0c06c950ee4c0903c1b5bd210a902 (patch)
tree1d7eff610f75a4e897a98356035d7ce7a743d243 /drivers
parent77fe07b29f4ea60c3feeb3b20a8df25d8358b812 (diff)
msm: camera: isp: fix overflow during stop axi stream
In dual VFE case, VFE0 and VFE1 will have different behavior during stoping pix stream. We should disable write master sync to ensure both VFEs stop as expected. Change-Id: Ib63b52a948e526e0d2518cb563a4fc4d67340d0f Signed-off-by: chiz <chiz@codeaurora.org> CRs-Fixed: 977856
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c4
1 files changed, 3 insertions, 1 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 e282ac6e1c78..380d78db18d4 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
@@ -1263,7 +1263,9 @@ void msm_isp_axi_stream_update(struct vfe_device *vfe_dev,
else if (axi_data->stream_info[i].state == START_PENDING ||
axi_data->stream_info[i].state == STOP_PENDING) {
msm_isp_axi_stream_enable_cfg(
- vfe_dev, &axi_data->stream_info[i], 1);
+ vfe_dev, &axi_data->stream_info[i],
+ axi_data->stream_info[i].state ==
+ START_PENDING ? 1 : 0);
axi_data->stream_info[i].state =
axi_data->stream_info[i].state ==
START_PENDING ? STARTING : STOPPING;