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

Unverified Commit 6bbd3cf3 authored by junwen.ye's avatar junwen.ye Committed by Michael Bestas
Browse files

[Camera]Record 4K video can not be saved 

&&&%%%comment:[Camera]Record 4K video can not be saved
&&&%%%product name:sm7225_s_fp4_target_dev
&&&%%%jira id:FP4S-434
&&&%%%root cause:coding
&&&%%%Bug category:T2M
&&&%%%Module_Impact:kernel
&&&%%%Test_Suggestion:NA
&&&%%%Solution:NA
&&&%%%Test_Report:waiting for test
&&&%%%VAL Can Test:NA

Change-Id: Ic525943a332e3e6b433e5981df7b81b70de4d0f0
parent d7cd4427

techpack/camera/drivers/cam_sensor_module/cam_sensor/cam_sensor_core.c

+3 −3
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 
			s_ctrl->power_stat = CAM_SENSOR_POWER_ON;

		}

		else{

			CAM_ERR(CAM_SENSOR,"SENSOR already power on !!");

			CAM_DBG(CAM_SENSOR,"SENSOR already power on !!");

		}

		if (s_ctrl->i2c_data.poweron_reg_settings.is_settings_valid) {

			rc = cam_sensor_apply_settings(s_ctrl, 0,
@@ -1032,7 +1032,7 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 
			s_ctrl->power_stat = CAM_SENSOR_POWER_ON;

		}

		else{

			CAM_ERR(CAM_SENSOR,"SENSOR already power on!!");

			CAM_DBG(CAM_SENSOR,"SENSOR already power on!!");

		}



		s_ctrl->sensor_state = CAM_SENSOR_ACQUIRE;
@@ -1211,7 +1211,7 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 
			}

			else

			{

				CAM_ERR(CAM_SENSOR,"sensor already init setting !!!!");

				CAM_DBG(CAM_SENSOR,"sensor already init setting !!!!");

			}

			rc = delete_request(&s_ctrl->i2c_data.init_settings);

			if (rc < 0) {

techpack/camera/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c

+5 −0
Original line number Diff line number Diff line
@@ -1864,6 +1864,11 @@ int cam_sensor_core_power_up(struct cam_sensor_power_ctrl_t *ctrl, 
	if (soc_info->use_shared_clk)

		cam_res_mgr_shared_clk_config(true);



	if (!strcmp(soc_info->dev_name,"ac4a000.qcom,cci0:qcom,ois@0")) {

		CAM_DBG(CAM_SENSOR, "OIS no need power up again!");

		return 0;

	}

	

	ret = msm_camera_pinctrl_init(&(ctrl->pinctrl_info), ctrl->dev);

	if (ret < 0) {

		/* Some sensor subdev no pinctrl. */

techpack/camera/drivers/cam_utils/cam_debug_util.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ const char *cam_get_module_name(unsigned int module_id); 
 * @args     :  Arguments which needs to be print in log

 */

#define CAM_INFO(__module, fmt, args...)                           \

	pr_info("CAM_INFO: %s: %s: %d " fmt "\n",                     \

	pr_debug("CAM_INFO: %s: %s: %d " fmt "\n",                     \

		cam_get_module_name(__module), __func__,  __LINE__, ##args)



/*