Merge "msm: camera: Avoid writing wrong reg in BF_scale stats configuration" (5278e664) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/isp/msm_isp44.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -813,6 +813,7 @@ static void msm_vfe44_axi_clear_wm_reg(
		{
		uint32_t val = 0;
		uint32_t wm_base = VFE44_WM_BASE(stream_info->wm[plane_idx]);

		/WR_ADDR_CFG/
		msm_camera_io_w(val, vfe_dev->vfe_base + wm_base + 0xC);
		/WR_IMAGE_SIZE/
		@@ -1087,6 +1088,11 @@ static void msm_vfe44_stats_cfg_wm_reg(
		int stats_idx = STATS_IDX(stream_info->stream_handle);
		uint32_t stats_base = VFE44_STATS_BASE(stats_idx);

		/* BF_SCALE does not have its own WR_ADDR_CFG,
		* IRQ_FRAMEDROP_PATTERN and IRQ_SUBSAMPLE_PATTERN;
		* it's using the same from BF */
		if (stats_idx == STATS_IDX_BF_SCALE)
		return;
		/WR_ADDR_CFG/
		msm_camera_io_w(stream_info->framedrop_period << 2,
		vfe_dev->vfe_base + stats_base + 0x8);
		@@ -1105,6 +1111,11 @@ static void msm_vfe44_stats_clear_wm_reg(
		uint32_t val = 0;
		int stats_idx = STATS_IDX(stream_info->stream_handle);
		uint32_t stats_base = VFE44_STATS_BASE(stats_idx);
		/* BF_SCALE does not have its own WR_ADDR_CFG,
		* IRQ_FRAMEDROP_PATTERN and IRQ_SUBSAMPLE_PATTERN;
		* it's using the same from BF */
		if (stats_idx == STATS_IDX_BF_SCALE)
		return;

		/WR_ADDR_CFG/
		msm_camera_io_w(val, vfe_dev->vfe_base + stats_base + 0x8);