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

Commit 6f368d8c authored by Sreesudhan Ramakrish Ramkumar's avatar Sreesudhan Ramakrish Ramkumar
Browse files

msm: camera: Implement reg cmd list update for ISP 



Iterate through the list in ioctl handler and perform multilple
hardware update in single ioctl call. This support is required
for minimizing ioctl calls from multiple ISP modules. hw update
list is created in user space from individual modules and provided
to kernel in single ioctl call.

Change-Id: I991d1819bc69a6d78cc6226525e9cd593677df70
Signed-off-by: default avatarSreesudhan Ramakrish Ramkumar <srramku@codeaurora.org>
parent 53341987

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

+47 −0
Original line number Diff line number Diff line
@@ -365,6 +365,12 @@ long msm_isp_ioctl(struct v4l2_subdev *sd, 
		mutex_unlock(&vfe_dev->realtime_mutex);

		break;

	}

	case VIDIOC_MSM_VFE_REG_LIST_CFG: {

		mutex_lock(&vfe_dev->realtime_mutex);

		rc = msm_isp_proc_cmd_list(vfe_dev, arg);

		mutex_unlock(&vfe_dev->realtime_mutex);

		break;

	}

	case VIDIOC_MSM_ISP_REQUEST_BUF:

	case VIDIOC_MSM_ISP_ENQUEUE_BUF:

	case VIDIOC_MSM_ISP_RELEASE_BUF: {
@@ -663,6 +669,47 @@ reg_cfg_failed: 
	return rc;

}



int msm_isp_proc_cmd_list(struct vfe_device *vfe_dev, void *arg)

{

	int rc = 0;

	struct msm_vfe_cfg_cmd_list *proc_cmd =

		(struct msm_vfe_cfg_cmd_list *)arg;

	struct msm_vfe_cfg_cmd_list cmd, cmd_next;



	if (!vfe_dev || !arg) {

		pr_err("%s:%d failed: vfe_dev %p arg %p", __func__, __LINE__,

			vfe_dev, arg);

		return -EINVAL;

	}



	rc = msm_isp_proc_cmd(vfe_dev, &proc_cmd->cfg_cmd);

	if (rc < 0)

		pr_err("%s:%d failed: rc %d", __func__, __LINE__, rc);



	cmd = *proc_cmd;



	while (cmd.next) {

		if (cmd.next_size != sizeof(struct msm_vfe_cfg_cmd_list)) {

			pr_err("%s:%d failed: next size %d != expected %d\n",

				__func__, __LINE__, cmd.next_size,

				sizeof(struct msm_vfe_cfg_cmd_list));

			break;

		}

		if (copy_from_user(&cmd_next, (void __user *)cmd.next,

			sizeof(struct msm_vfe_cfg_cmd_list))) {

			rc = -EFAULT;

			continue;

		}



		rc = msm_isp_proc_cmd(vfe_dev, &cmd_next.cfg_cmd);

		if (rc < 0)

			pr_err("%s:%d failed: rc %d", __func__, __LINE__, rc);



		cmd = cmd_next;

	}

	return rc;

}



int msm_isp_send_event(struct vfe_device *vfe_dev,

	uint32_t event_type,

	struct msm_isp_event_data *event_data)

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.h

+1 −0
Original line number Diff line number Diff line
@@ -72,4 +72,5 @@ void msm_isp_process_error_info(struct vfe_device *vfe_dev); 
int msm_isp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh);

int msm_isp_close_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh);

long msm_isp_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg);

int msm_isp_proc_cmd_list(struct vfe_device *vfe_dev, void *arg);

#endif /* __MSM_ISP_UTIL_H__ */

include/media/msmb_isp.h

+3 −0
Original line number Diff line number Diff line
@@ -427,4 +427,7 @@ struct msm_isp_event_data { 
#define VIDIOC_MSM_ISP_UPDATE_STREAM \

	_IOWR('V', BASE_VIDIOC_PRIVATE+13, struct msm_vfe_axi_stream_update_cmd)



#define VIDIOC_MSM_VFE_REG_LIST_CFG \

	_IOWR('V', BASE_VIDIOC_PRIVATE+14, struct msm_vfe_cfg_cmd_list)



#endif /* __MSMB_ISP__ */