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

Commit 5fabf63e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: change timestamp to gettimeofday"

parents 376d03b7 57373a2c

drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int32_t msm_isp_stats_configure(struct vfe_device *vfe_dev, 
	uint32_t comp_stats_type_mask = 0;



	memset(&buf_event, 0, sizeof(struct msm_isp_event_data));

	buf_event.timestamp = ts->event_time;

	buf_event.timestamp = ts->buf_time;

	buf_event.frame_id = vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id;

	pingpong_status = vfe_dev->hw_info->

		vfe_ops.stats_ops.get_pingpong_status(vfe_dev);

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+1 −2
Original line number Diff line number Diff line
@@ -345,8 +345,7 @@ static inline void msm_isp_get_timestamp(struct msm_isp_timestamp *time_stamp) 
	get_monotonic_boottime(&ts);

	time_stamp->buf_time.tv_sec    = ts.tv_sec;

	time_stamp->buf_time.tv_usec   = ts.tv_nsec/1000;

	time_stamp->event_time.tv_sec  = ts.tv_sec;

	time_stamp->event_time.tv_usec = ts.tv_nsec/1000;

	do_gettimeofday(&(time_stamp->event_time));

}



static inline u32 msm_isp_evt_mask_to_isp_event(u32 evt_mask)