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-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: isp: Update camera timestamps to ktime API" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Jong-Guk Im 2019-11-27 14:08:52 -08:00 • committed by Gerrit - the friendly Code Review server
commit 59b5e03e98
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
View file

@ -2795,7 +2795,7 @@ static int cam_ife_mgr_acquire_hw(void *hw_mgr_priv, void *acquire_hw_args)
acquire_args->valid_acquired_hw =
acquire_hw_info->num_inputs;
getnstimeofday64(&ife_ctx->ts);
ktime_get_real_ts64(&ife_ctx->ts);
CAM_INFO(CAM_ISP,
"Acquire HW success with total_pix: %u total_rdi: %u is_dual: %u in ctx: %u",
total_pix_port, total_rdi_port,

2
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
View file

@ -2997,7 +2997,7 @@ static int cam_ife_csid_get_time_stamp(
CAM_IFE_CSID_QTIMER_DIV_FACTOR);
if (!csid_hw->prev_boot_timestamp) {
get_monotonic_boottime64(&ts);
ktime_get_boottime_ts64(&ts);
time_stamp->boot_timestamp =
(uint64_t)((ts.tv_sec * 1000000000) +
ts.tv_nsec);

2
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.c
View file

@ -381,7 +381,7 @@ void cam_isp_hw_get_timestamp(struct cam_isp_timestamp *time_stamp)
{
struct timespec ts;
get_monotonic_boottime(&ts);
ts = ktime_to_timespec(ktime_get_boottime());
time_stamp->mono_time.tv_sec = ts.tv_sec;
time_stamp->mono_time.tv_usec = ts.tv_nsec/1000;
}