From 9d1dd49705f60d1fb5e6593e2fff1780dc43fe93 Mon Sep 17 00:00:00 2001 From: mingpan Date: Wed, 31 May 2023 10:33:32 +0800 Subject: [PATCH] msm: camera: isp: Remove isp state monitor from struct cam_isp_context Now isp state monitor is moved into dbg_monitors, but some function is still using isp state monitor in struct cam_isp_context. we should use isp state monitor in dbg_monitors and need to remove isp state monitor from struct cam_isp_context. CRs-Fixed: 3514701 Change-Id: Ib993f25234654ad5be74617d6ddb82355ece33bc Signed-off-by: mingpan --- drivers/cam_isp/cam_isp_context.c | 16 ++++++++-------- drivers/cam_isp/cam_isp_context.h | 3 --- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/cam_isp/cam_isp_context.c b/drivers/cam_isp/cam_isp_context.c index ec7d9e67c7..74be360a6a 100644 --- a/drivers/cam_isp/cam_isp_context.c +++ b/drivers/cam_isp/cam_isp_context.c @@ -477,11 +477,11 @@ static void __cam_isp_ctx_update_state_monitor_array( req_id; if (trigger_type == CAM_ISP_STATE_CHANGE_TRIGGER_CDM_DONE) - ctx_isp->cam_isp_ctx_state_monitor[iterator].evt_time_stamp = + ctx_isp->dbg_monitors.state_monitor[iterator].evt_time_stamp = ctx->cdm_done_ts; else ktime_get_clocktai_ts64( - &ctx_isp->cam_isp_ctx_state_monitor[iterator].evt_time_stamp); + &ctx_isp->dbg_monitors.state_monitor[iterator].evt_time_stamp); } static int __cam_isp_ctx_update_frame_timing_record( @@ -641,18 +641,18 @@ static void __cam_isp_ctx_dump_state_monitor_array( index = oldest_entry; for (i = 0; i < num_entries; i++) { - time64_to_tm(ctx_isp->cam_isp_ctx_state_monitor[index].evt_time_stamp.tv_sec, + time64_to_tm(ctx_isp->dbg_monitors.state_monitor[index].evt_time_stamp.tv_sec, 0, &ts); CAM_ERR(CAM_ISP, "Idx[%d] time[%d-%d %d:%d:%d.%lld]:Substate[%s] Frame[%lld] Req[%llu] evt[%s]", index, ts.tm_mon + 1, ts.tm_mday, ts.tm_hour, ts.tm_min, ts.tm_sec, - ctx_isp->cam_isp_ctx_state_monitor[index].evt_time_stamp.tv_nsec / 1000000, + ctx_isp->dbg_monitors.state_monitor[index].evt_time_stamp.tv_nsec / 1000000, __cam_isp_ctx_substate_val_to_type( - ctx_isp->cam_isp_ctx_state_monitor[index].curr_state), - ctx_isp->cam_isp_ctx_state_monitor[index].frame_id, - ctx_isp->cam_isp_ctx_state_monitor[index].req_id, + ctx_isp->dbg_monitors.state_monitor[index].curr_state), + ctx_isp->dbg_monitors.state_monitor[index].frame_id, + ctx_isp->dbg_monitors.state_monitor[index].req_id, __cam_isp_hw_evt_val_to_type( - ctx_isp->cam_isp_ctx_state_monitor[index].trigger)); + ctx_isp->dbg_monitors.state_monitor[index].trigger)); index = (index + 1) % CAM_ISP_CTX_STATE_MONITOR_MAX_ENTRIES; } diff --git a/drivers/cam_isp/cam_isp_context.h b/drivers/cam_isp/cam_isp_context.h index a35964bb18..b69ff2ef5c 100644 --- a/drivers/cam_isp/cam_isp_context.h +++ b/drivers/cam_isp/cam_isp_context.h @@ -402,9 +402,6 @@ struct cam_isp_context { uint32_t aeb_error_cnt; uint32_t out_of_sync_cnt; uint32_t congestion_cnt; - atomic64_t state_monitor_head; - struct cam_isp_context_state_monitor cam_isp_ctx_state_monitor[ - CAM_ISP_CTX_STATE_MONITOR_MAX_ENTRIES]; struct cam_isp_context_req_id_info req_info; struct cam_isp_context_debug_monitors dbg_monitors; bool rdi_only_context;