Merge "msm: camera: sensor: Add support for sensor read" (ebedb9c8) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_actuator/cam_actuator_core.c

+4 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2022, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -563,7 +563,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		rc = cam_sensor_i2c_command_parser(
		&a_ctrl->io_master_info,
		i2c_reg_settings,
		&cmd_desc[i], 1);
		&cmd_desc[i], 1, NULL);
		if (rc < 0) {
		CAM_ERR(CAM_ACTUATOR,
		"Failed:parse init settings: %d",
		@@ -625,7 +625,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		rc = cam_sensor_i2c_command_parser(
		&a_ctrl->io_master_info,
		i2c_reg_settings,
		cmd_desc, 1);
		cmd_desc, 1, NULL);
		if (rc < 0) {
		CAM_ERR(CAM_ACTUATOR,
		"Auto move lens parsing failed: %d", rc);
		@@ -656,7 +656,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		rc = cam_sensor_i2c_command_parser(
		&a_ctrl->io_master_info,
		i2c_reg_settings,
		cmd_desc, 1);
		cmd_desc, 1, NULL);
		if (rc < 0) {
		CAM_ERR(CAM_ACTUATOR,
		"Manual move lens parsing failed: %d", rc);

drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_flash/cam_flash_core.c

+4 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2022, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -1079,7 +1079,7 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl fctrl, void arg)
		rc = cam_sensor_i2c_command_parser(
		&fctrl->io_master_info,
		i2c_reg_settings,
		&cmd_desc[i], 1);
		&cmd_desc[i], 1, NULL);
		if (rc < 0) {
		CAM_ERR(CAM_FLASH,
		"pkt parsing failed: %d", rc);
		@@ -1159,7 +1159,7 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl fctrl, void arg)
		cmd_desc = (struct cam_cmd_buf_desc *)(offset);
		rc = cam_sensor_i2c_command_parser(
		&fctrl->io_master_info,
		i2c_reg_settings, cmd_desc, 1);
		i2c_reg_settings, cmd_desc, 1, NULL);
		if (rc) {
		CAM_ERR(CAM_FLASH,
		"Failed in parsing i2c packets");
		@@ -1190,7 +1190,7 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl fctrl, void arg)
		cmd_desc = (struct cam_cmd_buf_desc *)(offset);
		rc = cam_sensor_i2c_command_parser(
		&fctrl->io_master_info,
		i2c_reg_settings, cmd_desc, 1);
		i2c_reg_settings, cmd_desc, 1, NULL);
		if (rc) {
		CAM_ERR(CAM_FLASH,
		"Failed in parsing i2c NRT packets");

drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_ois/cam_ois_core.c

+4 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2022, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -552,7 +552,7 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		rc = cam_sensor_i2c_command_parser(
		&o_ctrl->io_master_info,
		i2c_reg_settings,
		&cmd_desc[i], 1);
		&cmd_desc[i], 1, NULL);
		if (rc < 0) {
		CAM_ERR(CAM_OIS,
		"init parsing failed: %d", rc);
		@@ -569,7 +569,7 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		rc = cam_sensor_i2c_command_parser(
		&o_ctrl->io_master_info,
		i2c_reg_settings,
		&cmd_desc[i], 1);
		&cmd_desc[i], 1, NULL);
		if (rc < 0) {
		CAM_ERR(CAM_OIS,
		"Calib parsing failed: %d", rc);
		@@ -644,7 +644,7 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		i2c_reg_settings->request_id = 0;
		rc = cam_sensor_i2c_command_parser(&o_ctrl->io_master_info,
		i2c_reg_settings,
		cmd_desc, 1);
		cmd_desc, 1, NULL);
		if (rc < 0) {
		CAM_ERR(CAM_OIS, "OIS pkt parsing failed: %d", rc);
		goto rel_pkt;

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

+42 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2022, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -94,6 +94,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		struct cam_control *ioctl_ctrl = NULL;
		struct cam_packet *csl_packet = NULL;
		struct cam_cmd_buf_desc *cmd_desc = NULL;
		struct cam_buf_io_cfg *io_cfg = NULL;
		struct i2c_settings_array *i2c_reg_settings = NULL;
		size_t len_of_buff = 0;
		size_t remain_len = 0;
		@@ -194,7 +195,27 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		i2c_reg_settings->is_settings_valid = 1;
		break;
		}
		case CAM_SENSOR_PACKET_OPCODE_SENSOR_READ: {
		i2c_reg_settings = &(i2c_data->read_settings);
		i2c_reg_settings->request_id = 0;
		i2c_reg_settings->is_settings_valid = 1;

		CAM_DBG(CAM_SENSOR, "number of IO configs: %d:",
		csl_packet->num_io_configs);
		if (csl_packet->num_io_configs == 0) {
		CAM_ERR(CAM_SENSOR, "No I/O configs to process");
		goto rel_pkt_buf;
		}
		io_cfg = (struct cam_buf_io_cfg ) ((uint8_t )
		&csl_packet->payload +
		csl_packet->io_configs_offset);

		if (io_cfg == NULL) {
		CAM_ERR(CAM_SENSOR, "I/O config is invalid(NULL)");
		goto rel_pkt_buf;
		}
		break;
		}
		case CAM_SENSOR_PACKET_OPCODE_SENSOR_UPDATE: {
		if ((s_ctrl->sensor_state == CAM_SENSOR_INIT) \|\|
		(s_ctrl->sensor_state == CAM_SENSOR_ACQUIRE)) {
		@@ -246,7 +267,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		cmd_desc = (struct cam_cmd_buf_desc *)(offset);

		rc = cam_sensor_i2c_command_parser(&s_ctrl->io_master_info,
		i2c_reg_settings, cmd_desc, 1);
		i2c_reg_settings, cmd_desc, 1, io_cfg);
		if (rc < 0) {
		CAM_ERR(CAM_SENSOR, "Fail parsing I2C Pkt: %d", rc);
		goto rel_pkt_buf;
		@@ -323,7 +344,6 @@ static int32_t cam_sensor_i2c_modes_util(
		}
		}
		}

		return rc;
		}

		@@ -986,6 +1006,25 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl,
		}
		s_ctrl->sensor_state = CAM_SENSOR_CONFIG;
		}

		if (s_ctrl->i2c_data.read_settings.is_settings_valid) {
		rc = cam_sensor_i2c_read_data(
		&s_ctrl->i2c_data.read_settings,
		&s_ctrl->io_master_info);
		if (rc < 0) {
		CAM_ERR(CAM_SENSOR, "cannot read data: %d", rc);
		delete_request(&s_ctrl->i2c_data.read_settings);
		goto release_mutex;
		}
		rc = delete_request(
		&s_ctrl->i2c_data.read_settings);
		if (rc < 0) {
		CAM_ERR(CAM_SENSOR,
		"Fail in deleting the read settings");
		goto release_mutex;
		}
		}

		}
		break;
		default:

drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_sensor/cam_sensor_dev.c

+3 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2022, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -187,6 +187,7 @@ static int32_t cam_sensor_driver_i2c_probe(struct i2c_client *client,
		INIT_LIST_HEAD(&(s_ctrl->i2c_data.config_settings.list_head));
		INIT_LIST_HEAD(&(s_ctrl->i2c_data.streamon_settings.list_head));
		INIT_LIST_HEAD(&(s_ctrl->i2c_data.streamoff_settings.list_head));
		INIT_LIST_HEAD(&(s_ctrl->i2c_data.read_settings.list_head));

		for (i = 0; i < MAX_PER_FRAME_ARRAY; i++)
		INIT_LIST_HEAD(&(s_ctrl->i2c_data.per_frame[i].list_head));
		@@ -323,6 +324,7 @@ static int32_t cam_sensor_driver_platform_probe(
		INIT_LIST_HEAD(&(s_ctrl->i2c_data.config_settings.list_head));
		INIT_LIST_HEAD(&(s_ctrl->i2c_data.streamon_settings.list_head));
		INIT_LIST_HEAD(&(s_ctrl->i2c_data.streamoff_settings.list_head));
		INIT_LIST_HEAD(&(s_ctrl->i2c_data.read_settings.list_head));

		for (i = 0; i < MAX_PER_FRAME_ARRAY; i++)
		INIT_LIST_HEAD(&(s_ctrl->i2c_data.per_frame[i].list_head));