xiaomi-unicorn2/android_kernel_xiaomi_sm8450-modules
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "msm: camera: flash: Proper handling of epcr reqs"

Browse Source 
This reverts commit 18b54c06a8.

Change-Id: I45776bcfe194582eeff13bc9689ffe30749045f4
This commit is contained in:
Jens Reidel
2023-04-15 19:09:29 +02:00
committed by Arian
parent 444b2f956d
commit d270b0d515
2 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
qcom/opensource/camera-kernel/drivers/cam_sensor_module/cam_flash/cam_flash_core.c
View File

@@ -1091,7 +1091,6 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
uint32_t *cmd_buf = NULL;
uint32_t *offset = NULL;
uint32_t frm_offset = 0;
uint32_t csl_req_id = 0;
size_t len_of_buffer;
size_t remain_len;
struct cam_flash_init *flash_init = NULL;
@@ -1343,7 +1342,6 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
case CAM_FLASH_PACKET_OPCODE_SET_OPS: {
frm_offset = csl_packet->header.request_id %
MAX_PER_FRAME_ARRAY;
csl_req_id = csl_packet->header.request_id;
/* add support for handling i2c_data*/
i2c_reg_settings =
&fctrl->i2c_data.per_frame[frm_offset];
@@ -1366,7 +1364,7 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
if ((fctrl->flash_state == CAM_FLASH_STATE_ACQUIRE) ||
(fctrl->flash_state == CAM_FLASH_STATE_CONFIG)) {
fctrl->flash_state = CAM_FLASH_STATE_CONFIG;
rc = fctrl->func_tbl.apply_setting(fctrl, csl_req_id);
rc = fctrl->func_tbl.apply_setting(fctrl, 1);
if (rc) {
CAM_ERR(CAM_FLASH, "cannot apply fire settings rc = %d", rc);
return rc;
@@ -1375,37 +1373,6 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
}
break;
}
case CAM_FLASH_PACKET_OPCODE_INIT_FIRE: {
frm_offset = csl_packet->header.request_id %
MAX_PER_FRAME_ARRAY;
csl_req_id = csl_packet->header.request_id;
CAM_DBG(CAM_FLASH, "Flash pkt init fire opcode received");
/* add support for handling i2c_data*/
i2c_reg_settings =
&fctrl->i2c_data.per_frame[frm_offset];
if (i2c_reg_settings->is_settings_valid == true) {
i2c_reg_settings->request_id = 0;
i2c_reg_settings->is_settings_valid = false;
goto update_req_mgr;
}
i2c_reg_settings->is_settings_valid = true;
i2c_reg_settings->request_id =
csl_packet->header.request_id;
rc = cam_sensor_i2c_command_parser(
&fctrl->io_master_info,
i2c_reg_settings, cmd_desc, 1, NULL);
if (rc) {
CAM_ERR(CAM_FLASH,
"Failed in parsing i2c packets");
return rc;
}
/* Apply the settings immediately as it is an EPR Req*/
rc = fctrl->func_tbl.apply_setting(fctrl, csl_req_id);
if (rc)
CAM_ERR(CAM_FLASH, "cannot apply init fire cmd rc = %d", rc);
return rc;
}
case CAM_FLASH_PACKET_OPCODE_NON_REALTIME_SET_OPS: {
/* add support for handling i2c_data*/

1
qcom/opensource/camera-kernel/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h
View File

@@ -49,7 +49,6 @@
#define CAM_FLASH_PACKET_OPCODE_SET_OPS 1
#define CAM_FLASH_PACKET_OPCODE_NON_REALTIME_SET_OPS 2
#define CAM_FLASH_PACKET_OPCODE_STREAM_OFF 3
#define CAM_FLASH_PACKET_OPCODE_INIT_FIRE 4
struct cam_flash_ctrl;