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

msm: camera: isp: fix an issue in scratch buffer configuration

Browse source 
When configure the scratch buffer, wrong pingpong bit location is
programmed. So the VFE hardware can still write to the same buffer
which has been diverted to other camera compoment. This cause the image
corruption.

Change-Id: I6d5cfe0c00a237efb3ab3dff87459341736d45a7
Signed-off-by: Jing Zhou <jzhou70@codeaurora.org>
This commit is contained in:
Jing Zhou 2016-02-04 14:32:34 -08:00 • committed by David Keitel
parent 164cec81a9
commit d5d3df187e
1 changed files with 5 additions and 5 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.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -91,11 +91,11 @@ void msm_isp_halt_send_error(struct vfe_device *vfe_dev, uint32_t event);
static inline void msm_isp_cfg_wm_scratch(struct vfe_device *vfe_dev,
int wm,
uint32_t pingpong_status)
uint32_t pingpong_bit)
{
vfe_dev->hw_info->vfe_ops.axi_ops.update_ping_pong_addr(
vfe_dev->vfe_base, wm,
pingpong_status, vfe_dev->buf_mgr->scratch_buf_addr, 0);
pingpong_bit, vfe_dev->buf_mgr->scratch_buf_addr, 0);
}
static inline void msm_isp_cfg_stream_scratch(struct vfe_device *vfe_dev,
@ -105,10 +105,10 @@ static inline void msm_isp_cfg_stream_scratch(struct vfe_device *vfe_dev,
int i;
uint32_t pingpong_bit;
pingpong_bit = (~(pingpong_status >> stream_info->wm[0]) & 0x1);
for (i = 0; i < stream_info->num_planes; i++)
msm_isp_cfg_wm_scratch(vfe_dev, stream_info->wm[i],
pingpong_status);
pingpong_bit = (~(pingpong_status >> stream_info->wm[0]) & 0x1);
~pingpong_bit);
stream_info->buf[pingpong_bit] = NULL;
}