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

Merge "Revert "msm: camera: isp: Update burst length for msmfalcon""

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-30 06:27:19 -08:00 • committed by Gerrit - the friendly Code Review server
commit fa8941a548
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,13 +30,10 @@
#define CDBG(fmt, args...) pr_debug(fmt, ##args)
#define VFE47_8996V1_VERSION 0x70000000
#define VFE48_SDM660_VERSION 0x80000003
#define VFE47_BURST_LEN 3
#define VFE48_SDM660_BURST_LEN 4
#define VFE47_FETCH_BURST_LEN 3
#define VFE47_STATS_BURST_LEN 3
#define VFE48_SDM660_STATS_BURST_LEN 4
#define VFE47_UB_SIZE_VFE0 2048
#define VFE47_UB_SIZE_VFE1 1536
#define VFE47_UB_STATS_SIZE 144
@ -1595,7 +1592,7 @@ void msm_vfe47_axi_cfg_wm_reg(
{
uint32_t val;
int vfe_idx = msm_isp_get_vfe_idx_for_stream(vfe_dev, stream_info);
uint32_t wm_base, burst_len;
uint32_t wm_base;
wm_base = VFE47_WM_BASE(stream_info->wm[vfe_idx][plane_idx]);
val = msm_camera_io_r(vfe_dev->vfe_base + wm_base + 0x14);
@ -1613,11 +1610,7 @@ void msm_vfe47_axi_cfg_wm_reg(
output_height - 1);
msm_camera_io_w(val, vfe_dev->vfe_base + wm_base + 0x1C);
/* WR_BUFFER_CFG */
if (vfe_dev->vfe_hw_version == VFE48_SDM660_VERSION)
burst_len = VFE48_SDM660_BURST_LEN;
else
burst_len = VFE47_BURST_LEN;
val = burst_len |
val = VFE47_BURST_LEN |
(stream_info->plane_cfg[vfe_idx][plane_idx].
output_height - 1) <<
2 |
@ -2212,7 +2205,7 @@ void msm_vfe47_stats_clear_wm_reg(
void msm_vfe47_stats_cfg_ub(struct vfe_device *vfe_dev)
{
int i;
uint32_t ub_offset = 0, stats_burst_len;
uint32_t ub_offset = 0;
uint32_t ub_size[VFE47_NUM_STATS_TYPE] = {
16, /* MSM_ISP_STATS_HDR_BE */
16, /* MSM_ISP_STATS_BG */
@ -2231,14 +2224,9 @@ void msm_vfe47_stats_cfg_ub(struct vfe_device *vfe_dev)
else
pr_err("%s: incorrect VFE device\n", __func__);
if (vfe_dev->vfe_hw_version == VFE48_SDM660_VERSION)
stats_burst_len = VFE48_SDM660_STATS_BURST_LEN;
else
stats_burst_len = VFE47_STATS_BURST_LEN;
for (i = 0; i < VFE47_NUM_STATS_TYPE; i++) {
ub_offset -= ub_size[i];
msm_camera_io_w(stats_burst_len << 30 |
msm_camera_io_w(VFE47_STATS_BURST_LEN << 30 |
ub_offset << 16 | (ub_size[i] - 1),
vfe_dev->vfe_base + VFE47_STATS_BASE(i) + 0x14);
}