Merge "msm: camera: isp: Update camera timestamps to ktime API" into camera-kernel.lnx.4.0
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

當前提交
59b5e03e98
@@ -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,
|
||||
|
@@ -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);
|
||||
|
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user