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

Merge "msm: camera: req_mgr: Fix request mismatch on slave bubble" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Camera Software Integration
2021-07-16 19:48:38 -07:00
committed by Gerrit - the friendly Code Review server
parent 399abd9ccd c834473607
commit 16520dd02f
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/cam_req_mgr/cam_req_mgr_core.c
View File

@@ -3183,7 +3183,7 @@ static bool cam_req_mgr_cb_notify_err(
(!err_info->req_id)) { (!err_info->req_id)) {
CAM_ERR(CAM_CRM, "invalid param: Err %d req %lld", CAM_ERR(CAM_CRM, "invalid param: Err %d req %lld",
err_info->error, err_info->req_id); err_info->error, err_info->req_id);
rc = false; rc = true;
goto end; goto end;
} }
tmp_slot = &link->req.in_q->slot[idx]; tmp_slot = &link->req.in_q->slot[idx];
@@ -3233,10 +3233,12 @@ static bool cam_req_mgr_cb_notify_err(
if (dev->ops && dev->ops->change_state) { if (dev->ops && dev->ops->change_state) {
state_info.dev_hdl = dev->dev_hdl; state_info.dev_hdl = dev->dev_hdl;
if (!(dev->ops->change_state(&state_info))) { if (dev->ops->change_state(&state_info)) {
CAM_DBG(CAM_CRM, CAM_DBG(CAM_CRM,
"Err on bubble notify"); "Err on bubble notify req %lld",
err_info->req_id);
rc = false; rc = false;
goto end;
} }
task = cam_req_mgr_workq_get_task(link->workq); task = cam_req_mgr_workq_get_task(link->workq);
@@ -3473,14 +3475,14 @@ static int cam_req_mgr_send_to_bubble(
rc = dev->ops->change_state( rc = dev->ops->change_state(
&state_info); &state_info);
if (rc < 0) if (rc < 0)
CAM_INFO(CAM_CRM, CAM_ERR(CAM_CRM,
"Failed to change state"); "Failed to change state");
} else { } else {
link->bubble_skip = link->max_delay; link->bubble_skip = link->max_delay - 1;
} }
} }
rc = cam_req_mgr_cb_notify_err(&notify); rc = cam_req_mgr_cb_notify_err(&notify);
if (!rc) if (rc)
CAM_INFO(CAM_CRM, CAM_INFO(CAM_CRM,
"Bubble recovery failed"); "Bubble recovery failed");
} }
@@ -3534,7 +3536,8 @@ static int cam_req_mgr_is_slave_link_ready(
struct cam_req_mgr_core_link *master_link, struct cam_req_mgr_core_link *master_link,
struct cam_req_mgr_slot *slot, struct cam_req_mgr_slot *slot,
int32_t fps, int32_t fps,
uint64_t frame_duration_ns) uint64_t frame_duration_ns,
uint64_t curr_boot_timestamp_ns)
{ {
struct cam_req_mgr_slot *sync_slot = NULL; struct cam_req_mgr_slot *sync_slot = NULL;
struct cam_req_mgr_req_queue *sync_in_q; struct cam_req_mgr_req_queue *sync_in_q;
@@ -3546,6 +3549,7 @@ static int cam_req_mgr_is_slave_link_ready(
uint64_t curr_sync_time_ns = 0; uint64_t curr_sync_time_ns = 0;
int64_t diff = 0; int64_t diff = 0;
uint64_t threshold_ns = 0; uint64_t threshold_ns = 0;
uint64_t time_left_to_apply;
int i, rc = 0; int i, rc = 0;
sof_time = master_link->sync_data.sof_time; sof_time = master_link->sync_data.sof_time;
@@ -3673,7 +3677,7 @@ static int cam_req_mgr_is_slave_link_ready(
rc = cam_req_mgr_send_to_bubble(master_link, rc = cam_req_mgr_send_to_bubble(master_link,
(sync_slot->req_id - (sync_slot->req_id -
sync_link->max_delay)); sync_link->max_delay));
master_link->sync_data.sync_link_sof_skip = true; master_link->sync_data.sync_link_sof_skip = true;
CAM_DBG(CAM_CRM, CAM_DBG(CAM_CRM,
"Master sof %lld slave sof %lld", "Master sof %lld slave sof %lld",
sof_time.csid_timestamp_ns, sof_time.csid_timestamp_ns,
@@ -3706,6 +3710,20 @@ static int cam_req_mgr_is_slave_link_ready(
cam_req_mgr_dump_link_info(&dump_info); cam_req_mgr_dump_link_info(&dump_info);
rc = -EINVAL; rc = -EINVAL;
} }
time_left_to_apply = (sof_time.boottime_ns +
((1000 * MILLI_SECOND_CONVERSION_FACTOR) /
master_link->fps)) - curr_boot_timestamp_ns;
if (time_left_to_apply < (4 * MILLI_SECOND_CONVERSION_FACTOR)) {
CAM_WARN_RATE_LIMIT(CAM_CRM,
"SOF time %lld epoch time %lld Time left to apply %lld ",
sof_time.boottime_ns, curr_boot_timestamp_ns, time_left_to_apply);
} else {
CAM_DBG(CAM_CRM,
"SOF time %lld epoch time %lld Time left to apply %lld ",
sof_time.boottime_ns, curr_boot_timestamp_ns, time_left_to_apply);
}
} }
return rc; return rc;
} }
@@ -3894,7 +3912,8 @@ static int cam_req_mgr_cb_notify_trigger(
*/ */
rc = cam_req_mgr_is_slave_link_ready( rc = cam_req_mgr_is_slave_link_ready(
link, slot, trigger_data->fps, frame_duration); link, slot, trigger_data->fps, frame_duration,
curr_boot_timestamp_ns);
if (rc) { if (rc) {
CAM_DBG(CAM_CRM, "Sync link not ready"); CAM_DBG(CAM_CRM, "Sync link not ready");
return rc; return rc;