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

Commit d6f309db authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: common: Change parameters to find time difference" into camera-kernel.lnx.1.0

parents 745eaeee a171a95a

drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ static int cam_fd_mgr_hw_dump( 
	return rc;

hw_dump:

	cur_time = ktime_get();

	diff = ktime_us_delta(frame_req->submit_timestamp, cur_time);

	diff = ktime_us_delta(cur_time, frame_req->submit_timestamp);

	cur_ts = ktime_to_timespec64(cur_time);

	req_ts = ktime_to_timespec64(frame_req->submit_timestamp);

	if (diff < CAM_FD_RESPONSE_TIME_THRESHOLD) {

drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -5225,7 +5225,7 @@ static int cam_icp_mgr_hw_dump(void *hw_priv, void *hw_dump_args) 
	return 0;

hw_dump:

	cur_time = ktime_get();

	diff = ktime_us_delta(frm_process->submit_timestamp[i], cur_time);

	diff = ktime_us_delta(cur_time, frm_process->submit_timestamp[i]);

	cur_ts = ktime_to_timespec64(cur_time);

	req_ts = ktime_to_timespec64(frm_process->submit_timestamp[i]);

drivers/cam_isp/cam_isp_context.c

+2 −3
Original line number Diff line number Diff line
@@ -2748,9 +2748,8 @@ static int __cam_isp_ctx_dump_in_top_state( 
	ctx_isp = (struct cam_isp_context *) ctx->ctx_priv;

	req_isp = (struct cam_isp_ctx_req *) req->req_priv;

	cur_time = ktime_get();

	diff = ktime_us_delta(

		req_isp->event_timestamp[CAM_ISP_CTX_EVENT_APPLY],

		cur_time);

	diff = ktime_us_delta(cur_time,

		req_isp->event_timestamp[CAM_ISP_CTX_EVENT_APPLY]);

	if (diff < CAM_ISP_CTX_RESPONSE_TIME_THRESHOLD) {

		CAM_INFO(CAM_ISP, "req %lld found no error",

			req->request_id);

drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -1543,7 +1543,7 @@ static int cam_jpeg_mgr_hw_dump(void *hw_mgr_priv, void *dump_hw_args) 


hw_dump:

	cur_time = ktime_get();

	diff = ktime_us_delta(p_cfg_req->submit_timestamp, cur_time);

	diff = ktime_us_delta(cur_time, p_cfg_req->submit_timestamp);

	cur_ts = ktime_to_timespec64(cur_time);

	req_ts = ktime_to_timespec64(p_cfg_req->submit_timestamp);

drivers/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_core.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int cam_lrme_hw_dump( 
	}



	cur_time = ktime_get();

	diff = ktime_us_delta(req->submit_timestamp, cur_time);

	diff = ktime_us_delta(cur_time, req->submit_timestamp);

	cur_ts = ktime_to_timespec64(cur_time);

	req_ts = ktime_to_timespec64(req->submit_timestamp);