samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: isp: Remove isp state monitor from struct cam_isp_context

Browse Source 
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 <quic_mingpan@quicinc.com>
This commit is contained in:
mingpan
2023-05-31 10:33:32 +08:00
committed by Camera Software Integration
parent 16cf3baad7
commit 9d1dd49705
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/cam_isp/cam_isp_context.c
View File

@@ -477,11 +477,11 @@ static void __cam_isp_ctx_update_state_monitor_array(
req_id; req_id;
if (trigger_type == CAM_ISP_STATE_CHANGE_TRIGGER_CDM_DONE) 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; ctx->cdm_done_ts;
else else
ktime_get_clocktai_ts64( 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( 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; index = oldest_entry;
for (i = 0; i < num_entries; i++) { 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); 0, &ts);
CAM_ERR(CAM_ISP, CAM_ERR(CAM_ISP,
"Idx[%d] time[%d-%d %d:%d:%d.%lld]:Substate[%s] Frame[%lld] Req[%llu] evt[%s]", "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, 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( __cam_isp_ctx_substate_val_to_type(
ctx_isp->cam_isp_ctx_state_monitor[index].curr_state), ctx_isp->dbg_monitors.state_monitor[index].curr_state),
ctx_isp->cam_isp_ctx_state_monitor[index].frame_id, ctx_isp->dbg_monitors.state_monitor[index].frame_id,
ctx_isp->cam_isp_ctx_state_monitor[index].req_id, ctx_isp->dbg_monitors.state_monitor[index].req_id,
__cam_isp_hw_evt_val_to_type( __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; index = (index + 1) % CAM_ISP_CTX_STATE_MONITOR_MAX_ENTRIES;
} }

3
drivers/cam_isp/cam_isp_context.h
View File

@@ -402,9 +402,6 @@ struct cam_isp_context {
uint32_t aeb_error_cnt; uint32_t aeb_error_cnt;
uint32_t out_of_sync_cnt; uint32_t out_of_sync_cnt;
uint32_t congestion_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_req_id_info req_info;
struct cam_isp_context_debug_monitors dbg_monitors; struct cam_isp_context_debug_monitors dbg_monitors;
bool rdi_only_context; bool rdi_only_context;