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

Commit a482aad0 authored by Vishalsingh Hajeri's avatar Vishalsingh Hajeri Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: sensor: Add pipeline delay to the probe structure 



Allow pipeline delay to be received from userspace.

Change-Id: I9a59342baa469f71b59abf56676d9fe05a9155c6
Signed-off-by: default avatarVishalsingh Hajeri <vhajeri@codeaurora.org>
Signed-off-by: default avatarVenkat Chinta <vchinta@codeaurora.org>
parent 135ff2ae

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c

+19 −3
Original line number Diff line number Diff line
@@ -340,14 +340,18 @@ int32_t cam_sensor_update_slave_info(struct cam_cmd_probe *probe_info, 
		probe_info->expected_data;

	s_ctrl->sensordata->slave_info.sensor_id_mask =

		probe_info->data_mask;

	/* Userspace passes the pipeline delay in reserved field */

	s_ctrl->pipeline_delay =

		probe_info->reserved;



	s_ctrl->sensor_probe_addr_type =  probe_info->addr_type;

	s_ctrl->sensor_probe_data_type =  probe_info->data_type;

	CAM_DBG(CAM_SENSOR,

		"Sensor Addr: 0x%x sensor_id: 0x%x sensor_mask: 0x%x",

		"Sensor Addr: 0x%x sensor_id: 0x%x sensor_mask: 0x%x sensor_pipeline_delay:0x%x",

		s_ctrl->sensordata->slave_info.sensor_id_reg_addr,

		s_ctrl->sensordata->slave_info.sensor_id,

		s_ctrl->sensordata->slave_info.sensor_id_mask);

		s_ctrl->sensordata->slave_info.sensor_id_mask,

		s_ctrl->pipeline_delay);

	return rc;

}
@@ -899,12 +903,24 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 
int cam_sensor_publish_dev_info(struct cam_req_mgr_device_info *info)

{

	int rc = 0;

	struct cam_sensor_ctrl_t *s_ctrl = NULL;



	if (!info)

		return -EINVAL;



	s_ctrl = (struct cam_sensor_ctrl_t *)

		cam_get_device_priv(info->dev_hdl);



	if (!s_ctrl) {

		CAM_ERR(CAM_SENSOR, "Device data is NULL");

		return -EINVAL;

	}



	info->dev_id = CAM_REQ_MGR_DEVICE_SENSOR;

	strlcpy(info->name, CAM_SENSOR_NAME, sizeof(info->name));

	if (s_ctrl->pipeline_delay >= 1 && s_ctrl->pipeline_delay <= 3)

		info->p_delay = s_ctrl->pipeline_delay;

	else

		info->p_delay = 2;

	info->trigger = CAM_TRIGGER_POINT_SOF;

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_dev.h

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ struct intf_params { 
 * @bob_reg_index: Hold to BoB regulator index

 * @bob_pwm_switch: Boolean flag to switch into PWM mode for BoB regulator

 * @last_flush_req: Last request to flush

 * @pipeline_delay: Sensor pipeline delay

 */

struct cam_sensor_ctrl_t {

	struct platform_device *pdev;
@@ -120,6 +121,7 @@ struct cam_sensor_ctrl_t { 
	int bob_reg_index;

	bool bob_pwm_switch;

	uint32_t last_flush_req;

	uint16_t pipeline_delay;

};



#endif /* _CAM_SENSOR_DEV_H_ */