A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

msm: camera: reqmgr: Modify SOF watchlog timer for INIT exposure

Browse source 
In case of long exposure shots, watchdog timer needs
to be modified for init exposure seeting also to avoid trigger.

CRs-Fixed: 2706105
Change-Id: Ife8b3ec32103aff71d281e11b68e0d48f4ef79e1
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
This commit is contained in:
Chandan Kumar Jha 2020-04-29 11:52:35 +05:30 • committed by Gerrit - the friendly Code Review server
commit 24e6de881c
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
drivers/cam_req_mgr/cam_req_mgr_core.c
View file

@ -50,6 +50,7 @@ void cam_req_mgr_core_link_reset(struct cam_req_mgr_core_link *link)
link->sof_timestamp = 0;
link->prev_sof_timestamp = 0;
link->enable_apply_default = false;
link->skip_init_frame = false;
atomic_set(&link->eof_event_cnt, 0);
}
@ -561,6 +562,13 @@ static void __cam_req_mgr_validate_crm_wd_timer(
int next_frame_timeout = 0, current_frame_timeout = 0;
struct cam_req_mgr_req_queue *in_q = link->req.in_q;
if (link->skip_init_frame) {
CAM_DBG(CAM_CRM,
"skipping modifying wd timer for first frame after streamon");
link->skip_init_frame = false;
return;
}
idx = in_q->rd_idx;
__cam_req_mgr_dec_idx(
&idx, (link->max_delay - 1),
@ -599,8 +607,8 @@ static void __cam_req_mgr_validate_crm_wd_timer(
crm_timer_modify(link->watchdog,
current_frame_timeout +
CAM_REQ_MGR_WATCHDOG_TIMEOUT);
} else if (link->watchdog->expires >
CAM_REQ_MGR_WATCHDOG_TIMEOUT) {
} else if (!next_frame_timeout && (link->watchdog->expires >
CAM_REQ_MGR_WATCHDOG_TIMEOUT)) {
CAM_DBG(CAM_CRM,
"Reset wd timer to default from %d ms to %d ms",
link->watchdog->expires,
@ -4045,6 +4053,7 @@ int cam_req_mgr_link_control(struct cam_req_mgr_link_control *control)
struct cam_req_mgr_connected_device *dev = NULL;
struct cam_req_mgr_link_evt_data evt_data;
int init_timeout = 0;
if (!control) {
CAM_ERR(CAM_CRM, "Control command is NULL");
@ -4076,10 +4085,13 @@ int cam_req_mgr_link_control(struct cam_req_mgr_link_control *control)
spin_lock_bh(&link->link_state_spin_lock);
link->state = CAM_CRM_LINK_STATE_READY;
spin_unlock_bh(&link->link_state_spin_lock);
if (control->init_timeout[i])
link->skip_init_frame = true;
init_timeout = (2 * control->init_timeout[i]);
/* Start SOF watchdog timer */
rc = crm_timer_init(&link->watchdog,
CAM_REQ_MGR_WATCHDOG_TIMEOUT_DEFAULT, link,
&__cam_req_mgr_sof_freeze);
(init_timeout + CAM_REQ_MGR_WATCHDOG_TIMEOUT),
link, &__cam_req_mgr_sof_freeze);
if (rc < 0) {
CAM_ERR(CAM_CRM,
"SOF timer start fails: link=0x%x",
@ -4110,6 +4122,7 @@ int cam_req_mgr_link_control(struct cam_req_mgr_link_control *control)
/* Destroy SOF watchdog timer */
spin_lock_bh(&link->link_state_spin_lock);
link->state = CAM_CRM_LINK_STATE_IDLE;
link->skip_init_frame = false;
crm_timer_exit(&link->watchdog);
spin_unlock_bh(&link->link_state_spin_lock);
} else {

3
drivers/cam_req_mgr/cam_req_mgr_core.h
View file

@ -369,6 +369,8 @@ struct cam_req_mgr_connected_device {
* frames where actual settings are not available.
* This will account for all devices irrespective of
* pipeline delay
* @skip_init_frame : skip initial frames crm_wd_timer validation in the
* case of long exposure use case
*/
struct cam_req_mgr_core_link {
int32_t link_hdl;
@ -403,6 +405,7 @@ struct cam_req_mgr_core_link {
uint32_t trigger_cnt[CAM_REQ_MGR_MAX_TRIGGERS];
atomic_t eof_event_cnt;
bool enable_apply_default;
bool skip_init_frame;
};
/**