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

Merge "msm: camera: reqmgr: update timer even after skip frame" into camera-kernel.lnx.4.0

Browse Source
This commit is contained in:
Haritha Chintalapati
2020-11-23 16:54:03 -08:00
committed by Gerrit - the friendly Code Review server
parent 9bc7143db7 b3673cb6b9
commit cf0971359d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/cam_req_mgr/cam_req_mgr_core.c
View File

@@ -1746,6 +1746,7 @@ static int __cam_req_mgr_process_req(struct cam_req_mgr_core_link *link,
} }
spin_unlock_bh(&link->link_state_spin_lock); spin_unlock_bh(&link->link_state_spin_lock);
__cam_req_mgr_notify_frame_skip(link, trigger); __cam_req_mgr_notify_frame_skip(link, trigger);
__cam_req_mgr_validate_crm_wd_timer(link);
goto end; goto end;
} }
} }
@@ -3324,6 +3325,10 @@ static int cam_req_mgr_cb_notify_trigger(
CAM_ERR_RATE_LIMIT(CAM_CRM, "no empty task frame %lld", CAM_ERR_RATE_LIMIT(CAM_CRM, "no empty task frame %lld",
trigger_data->frame_id); trigger_data->frame_id);
rc = -EBUSY; rc = -EBUSY;
spin_lock_bh(&link->link_state_spin_lock);
if ((link->watchdog) && !(link->watchdog->pause_timer))
link->watchdog->pause_timer = true;
spin_unlock_bh(&link->link_state_spin_lock);
goto end; goto end;
} }
task_data = (struct crm_task_payload *)task->payload; task_data = (struct crm_task_payload *)task->payload;