A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 21:54:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

camera: ois: use mono timestamp for ois data

Browse source 
[detail]
use mono timestamp for ois data

Change-Id: Iefe79dc95bccabb431dbef24a13448b9a5aa6a1e
Signed-off-by: liuwang2 <liuwang2@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2176429
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Zhuoran Xu <xuzr3@motorola.com>
Reviewed-by: <yinhy6@motorola.com>
Reviewed-by: Long Cheng <chengl1@motorola.com>
Reviewed-by: Zhichao Chen <chenzc2@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
liuwang2 2022-01-21 16:18:38 +08:00 • committed by zhaoji1
commit 813ed251ff
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
drivers/cam_sensor_module/cam_ois/cam_ois_core.c
View file

@ -115,8 +115,8 @@ static int cam_ois_power_up(struct cam_ois_ctrl_t *o_ctrl)
o_ctrl->prev_timestamp = 0;
o_ctrl->curr_timestamp = 0;
o_ctrl->is_first_vsync = 1;
o_ctrl->q_timer_cnt = QTIMER_SAMPLE_TIME*10*2;
o_ctrl->q_timer_timestamp = 0;
o_ctrl->q_timer_cnt = QTIMER_SAMPLE_TIME*10*2;
o_ctrl->mono_timestamp = 0;
soc_private =
(struct cam_ois_soc_private *)o_ctrl->soc_info.soc_private;
@ -582,7 +582,8 @@ static int cam_ois_write_q_timer(struct cam_ois_ctrl_t *o_ctrl)
struct cam_sensor_i2c_reg_array i2c_write_settings = {QTIMER_ADDR,0x0000,0,0};
int32_t rc = 0;
uint32_t data = 0;
uint64_t qtime_ns = 0;
uint64_t mono_time_ns = 0;
struct timespec64 ts;
if (!o_ctrl) {
CAM_ERR(CAM_OIS, "Invalid Args");
@ -601,14 +602,12 @@ static int cam_ois_write_q_timer(struct cam_ois_ctrl_t *o_ctrl)
if (rc < 0) {
CAM_ERR(CAM_OIS, "Failed in Applying Q-timer settings");
} else {
rc = cam_sensor_util_get_current_qtimer_ns(&qtime_ns);
if (rc < 0)
CAM_ERR(CAM_OIS, "failed to get qtimer rc:%d");
else
o_ctrl->q_timer_timestamp = qtime_ns;
ktime_get_boottime_ts64(&ts);
mono_time_ns = (uint64_t)((ts.tv_sec * 1000000000) + ts.tv_nsec);
o_ctrl->mono_timestamp = mono_time_ns;
}
CAM_DBG(CAM_OIS,"Write Q-timer %d, timestamp %lld", data, qtime_ns);
CAM_DBG(CAM_OIS,"Write Q-timer %d, mono timestamp %lld", data, mono_time_ns);
return rc;
}
@ -1473,17 +1472,17 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t *o_ctrl, void *arg)
}
delta_timestamp_ns = (o_ctrl->q_timer_cnt - latest_data_ts)*100000;
o_ctrl->q_timer_timestamp -= delta_timestamp_ns; // latest ois data timestamp
o_ctrl->mono_timestamp -= delta_timestamp_ns; // latest ois data timestamp
if (o_ctrl->q_timer_timestamp == 0) {
CAM_ERR(CAM_OIS, "q_timer_timestamp is zero.");
if (o_ctrl->mono_timestamp == 0) {
CAM_ERR(CAM_OIS, "mono_timestamp is zero.");
delete_request(&i2c_read_settings);
return -EINVAL;
}
CAM_DBG(CAM_OIS,"latest ois data timestamp %lld", o_ctrl->q_timer_timestamp);
CAM_DBG(CAM_OIS,"latest ois data mono timestamp %lld", o_ctrl->mono_timestamp);
memcpy((void *)timestampBuf, (void *)&o_ctrl->q_timer_timestamp, sizeof(uint64_t));
memcpy((void *)timestampBuf, (void *)&o_ctrl->mono_timestamp, sizeof(uint64_t));
}
}
rc = delete_request(&i2c_read_settings);

2
drivers/cam_sensor_module/cam_ois/cam_ois_dev.h
View file

@ -165,7 +165,7 @@ struct cam_ois_ctrl_t {
uint8_t *ois_data;
int ois_data_size;
uint16_t q_timer_cnt;
uint64_t q_timer_timestamp;
uint64_t mono_timestamp;
};
/**