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

Commit 9ec0948d authored by Senthil's avatar Senthil
Browse files

msm: camera: Enable more than one composite stats in VFE46 



Currently only one composite group of stats can be configured.
But if target supports added logic to form multiple composite masks
userspace will send composite group id along with stats stream info,
kernel will create composite masks and write to registers in VFE46.
This change add supports for multiple composite masks.

Change-Id: I27ffe0194fe4ab28b636b00b0213cdc7c6d5b75b
Signed-off-by: default avatarSenthil <skrajago@codeaurora.org>
parent 593d5a19

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

+61 −10
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 
#define VFE46_XBAR_SHIFT(idx) ((idx%2) ? 16 : 0)

#define VFE46_PING_PONG_BASE(wm, ping_pong) \

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

#define SHIFT_BF_SCALE_BIT 1

#define VFE46_NUM_STATS_COMP 2



static uint32_t stats_base_addr[] = {

	0x1E4, /* BF_SCALE */
@@ -1065,16 +1067,65 @@ static void msm_vfe46_stats_cfg_comp_mask( 
	struct vfe_device *vfe_dev,

	uint32_t stats_mask, uint8_t enable)

{

	uint32_t comp_mask;

	uint32_t reg_mask, comp_stats_mask, mask_bf_scale;

	uint32_t i = 0;

	atomic_t *stats_comp;

	struct msm_vfe_stats_shared_data *stats_data = &vfe_dev->stats_data;



	if (vfe_dev->hw_info->stats_hw_info->num_stats_comp_mask >

			MAX_NUM_STATS_COMP_MASK) {

		pr_err("%s: num of comp masks %d exceed max %d\n",

			__func__,

			vfe_dev->hw_info->stats_hw_info->num_stats_comp_mask,

			MAX_NUM_STATS_COMP_MASK);

		return;

	}



	/* BF scale is controlled by BF also */

	stats_mask = (stats_mask >> 1) & 0xFF;

	comp_mask = msm_camera_io_r(vfe_dev->vfe_base + 0x78) >> 16;

	if (enable)

		comp_mask |= stats_mask;

	else

		comp_mask &= ~stats_mask;

	msm_camera_io_w(comp_mask << 16, vfe_dev->vfe_base + 0x78);

	/* BF scale is controlled by BF also so ignore bit 0 of BF scale */

	stats_mask = stats_mask & 0x1FF;

	mask_bf_scale = stats_mask >> SHIFT_BF_SCALE_BIT;



	for (i = 0;

		i < vfe_dev->hw_info->stats_hw_info->num_stats_comp_mask; i++) {

		stats_comp = &stats_data->stats_comp_mask[i];

		reg_mask = msm_camera_io_r(vfe_dev->vfe_base + 0x78);

		comp_stats_mask = reg_mask & (STATS_COMP_BIT_MASK << (i*8));



		if (enable) {

			if (comp_stats_mask)

				continue;



			reg_mask |= (mask_bf_scale << (16 + i*8));

			atomic_add(stats_mask, stats_comp);

		} else {



			if (stats_mask & (1 << STATS_IDX_BF_SCALE) &&

				atomic_read(stats_comp) &

					(1 << STATS_IDX_BF_SCALE))

				atomic_sub((1 << STATS_IDX_BF_SCALE),

					stats_comp);



			/*

			 * Check if comp mask in reg is valid

			 * and contains this stat

			 */



			if (!comp_stats_mask ||

				!((comp_stats_mask >> (16 + i*8)) &

					mask_bf_scale))

				continue;



			atomic_sub(stats_mask, stats_comp);

			reg_mask &= ~(mask_bf_scale << (16 + i*8));

		}

		ISP_DBG("%s: comp_mask: %x atomic stats[0]: %x %x\n",

			__func__, reg_mask,

			atomic_read(&stats_data->stats_comp_mask[0]),

			atomic_read(&stats_data->stats_comp_mask[1]));



		msm_camera_io_w(reg_mask, vfe_dev->vfe_base + 0x78);

		return;

	}

}



static void msm_vfe46_stats_cfg_wm_irq_mask(
@@ -1335,7 +1386,7 @@ static struct msm_vfe_stats_hardware_info msm_vfe46_stats_hw_info = { 
		1 << MSM_ISP_STATS_BF_SCALE,

	.stats_ping_pong_offset = stats_pingpong_offset_map,

	.num_stats_type = VFE46_NUM_STATS_TYPE,

	.num_stats_comp_mask = 2,

	.num_stats_comp_mask = VFE46_NUM_STATS_COMP,

};



static struct v4l2_subdev_core_ops msm_vfe46_subdev_core_ops = {