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

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

Merge "mm-camera2:isp2: Use system time for VT"

parents a5370b86 5e9603b3

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

+1 −6
Original line number Diff line number Diff line
@@ -4115,12 +4115,7 @@ void msm_isp_process_axi_irq_stream(struct vfe_device *vfe_dev, 
		return;

	}



	if (vfe_dev->vt_enable) {

		msm_isp_get_avtimer_ts(ts);

		time_stamp = &ts->vt_time;

	} else {

	time_stamp = &ts->buf_time;

	}



	frame_id = vfe_dev->axi_data.

		src_info[SRC_TO_INTF(stream_info->stream_src)].frame_id;

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

+5 −9
Original line number Diff line number Diff line
@@ -207,15 +207,11 @@ void msm_isp_get_timestamp(struct msm_isp_timestamp *time_stamp, 
	struct timespec ts;



	do_gettimeofday(&(time_stamp->event_time));

	if (vfe_dev->vt_enable) {

		msm_isp_get_avtimer_ts(time_stamp);

		time_stamp->buf_time.tv_sec    = time_stamp->vt_time.tv_sec;

		time_stamp->buf_time.tv_usec   = time_stamp->vt_time.tv_usec;

	} else {



	get_monotonic_boottime(&ts);

	time_stamp->buf_time.tv_sec    = ts.tv_sec;

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

	}



}



static inline u32 msm_isp_evt_mask_to_isp_event(u32 evt_mask)