Advertisement
Guest User

Untitled

a guest
Jan 22nd, 2017
113
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.45 KB | None | 0 0
  1. diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
  2. index ffa658aff3da..3d4d56c7ea5b 100644
  3. --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
  4. +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
  5. @@ -198,7 +198,7 @@ static int32_t msm_isp_stats_configure(struct vfe_device *vfe_dev,
  6. uint32_t comp_stats_type_mask = 0;
  7.  
  8. memset(&buf_event, 0, sizeof(struct msm_isp_event_data));
  9. - buf_event.timestamp = ts->event_time;
  10. + buf_event.timestamp = ts->buf_time;
  11. buf_event.frame_id = vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id;
  12. pingpong_status = vfe_dev->hw_info->
  13. vfe_ops.stats_ops.get_pingpong_status(vfe_dev);
  14. diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
  15. index 5714f7de1c08..34f237a4557f 100644
  16. --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
  17. +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
  18. @@ -337,9 +337,9 @@ int msm_isp_get_clk_info(struct vfe_device *vfe_dev,
  19. void msm_isp_get_timestamp(struct msm_isp_timestamp *time_stamp)
  20. {
  21. struct timespec ts;
  22. - ktime_get_ts(&ts);
  23. - time_stamp->buf_time.tv_sec = ts.tv_sec;
  24. - time_stamp->buf_time.tv_usec = ts.tv_nsec/1000;
  25. + get_monotonic_boottime(&ts);
  26. + time_stamp->buf_time.tv_sec = ts.tv_sec;
  27. + time_stamp->buf_time.tv_usec = ts.tv_nsec/1000;
  28. do_gettimeofday(&(time_stamp->event_time));
  29. }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement