Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3e3cfef authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Enable CGC override for read intf"

parents 292073f3 72573804

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

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
#define VFE44_PING_PONG_BASE(wm, ping_pong) \

	(VFE44_WM_BASE(wm) + 0x4 * (1 + (~(ping_pong >> wm) & 0x1)))



#define VFE44_BUS_RD_CGC_OVERRIDE_BIT 16



static uint8_t stats_pingpong_offset_map[] = {

	7, 8, 9, 10, 11, 12, 13, 14, 15};
@@ -871,6 +873,9 @@ static void msm_vfe44_cfg_fetch_engine(struct vfe_device *vfe_dev, 
			__func__, fe_cfg->buf_width, fe_cfg->buf_height,

			fe_cfg->fetch_width, fe_cfg->fetch_height);



		vfe_dev->hw_info->vfe_ops.axi_ops.update_cgc_override(vfe_dev,

			VFE44_BUS_RD_CGC_OVERRIDE_BIT, 1);



		temp = msm_camera_io_r(vfe_dev->vfe_base + 0x50);

		temp &= 0xFFFFFFFD;

		temp |= (1 << 1);

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

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
	(VFE46_WM_BASE(wm) + 0x4 * (1 + (~(ping_pong >> wm) & 0x1)))

#define SHIFT_BF_SCALE_BIT 1

#define VFE46_NUM_STATS_COMP 2

#define VFE46_BUS_RD_CGC_OVERRIDE_BIT 16



static uint32_t stats_base_addr[] = {

	0x1E4, /* BF_SCALE */
@@ -855,6 +856,9 @@ static void msm_vfe46_cfg_fetch_engine(struct vfe_device *vfe_dev, 
		msm_camera_io_w(0xF6543210, vfe_dev->vfe_base + 0x288);

		msm_camera_io_w(0xF, vfe_dev->vfe_base + 0x2A4);



		vfe_dev->hw_info->vfe_ops.axi_ops.update_cgc_override(vfe_dev,

			VFE46_BUS_RD_CGC_OVERRIDE_BIT, 1);



		temp = msm_camera_io_r(vfe_dev->vfe_base + 0x50);

		temp |= 2 << 5;

		temp |= 128 << 8;