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

Merge "msm: camera: isp: Configure stats framedrop period correctly"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-19 11:17:56 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4f19b2964a
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
View file

@ -1943,7 +1943,7 @@ static void msm_vfe40_stats_cfg_wm_reg(
stats_idx = STATS_IDX(stream_info->stream_handle[vfe_idx]);
stats_base = VFE40_STATS_BASE(stats_idx);
/*WR_ADDR_CFG*/
msm_camera_io_w(stream_info->framedrop_period << 2,
msm_camera_io_w((stream_info->framedrop_period - 1) << 2,
vfe_dev->vfe_base + stats_base + 0x8);
/*WR_IRQ_FRAMEDROP_PATTERN*/
msm_camera_io_w(stream_info->framedrop_pattern,

2
drivers/media/platform/msm/camera_v2/isp/msm_isp44.c
View file

@ -1590,7 +1590,7 @@ static void msm_vfe44_stats_cfg_wm_reg(
if (stats_idx == STATS_IDX_BF_SCALE)
return;
/*WR_ADDR_CFG*/
msm_camera_io_w(stream_info->framedrop_period << 2,
msm_camera_io_w((stream_info->framedrop_period - 1) << 2,
vfe_dev->vfe_base + stats_base + 0x8);
/*WR_IRQ_FRAMEDROP_PATTERN*/
msm_camera_io_w(stream_info->framedrop_pattern,

2
drivers/media/platform/msm/camera_v2/isp/msm_isp46.c
View file

@ -1680,7 +1680,7 @@ static void msm_vfe46_stats_cfg_wm_reg(
return;
/* WR_ADDR_CFG */
msm_camera_io_w(stream_info->framedrop_period << 2,
msm_camera_io_w((stream_info->framedrop_period - 1) << 2,
vfe_dev->vfe_base + stats_base + 0x8);
/* WR_IRQ_FRAMEDROP_PATTERN */
msm_camera_io_w(stream_info->framedrop_pattern,

2
drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
View file

@ -2062,7 +2062,7 @@ void msm_vfe47_stats_cfg_wm_reg(
stats_base = VFE47_STATS_BASE(stats_idx);
/* WR_ADDR_CFG */
msm_camera_io_w(stream_info->framedrop_period << 2,
msm_camera_io_w((stream_info->framedrop_period - 1) << 2,
vfe_dev->vfe_base + stats_base + 0x10);
/* WR_IRQ_FRAMEDROP_PATTERN */
msm_camera_io_w(stream_info->framedrop_pattern,

2
drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
View file

@ -1263,7 +1263,7 @@ int msm_isp_update_stats_stream(struct vfe_device *vfe_dev, void *arg)
stream_info->framedrop_pattern = 0x0;
else
stream_info->framedrop_pattern = 0x1;
stream_info->framedrop_period = framedrop_period - 1;
stream_info->framedrop_period = framedrop_period;
if (stream_info->init_stats_frame_drop == 0)
for (k = 0; k < stream_info->num_isp; k++)
stream_info->vfe_dev[k]->hw_info->