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

msm: camera: isp: Update Recovery Scheme for non AEB modes

Browse Source 
If active/wait request lists are empty resume internal recovery
from the first request in the pending list.

CRs-Fixed: 3317349
Change-Id: Ib708d696065e2dc81deb1d27687d7afd191b0838
Signed-off-by: Karthik Anantha Ram <quic_kartanan@quicinc.com>
This commit is contained in:
Karthik Anantha Ram
2022-10-17 12:50:14 -07:00
committed by Camera Software Integration
parent d1444011db
commit 94deca6c12
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/cam_isp/cam_isp_context.c
View File

@@ -3508,9 +3508,9 @@ static int __cam_isp_ctx_validate_for_req_reapply_util(
if (list_empty(&ctx->wait_req_list)) { if (list_empty(&ctx->wait_req_list)) {
CAM_WARN(CAM_ISP, CAM_WARN(CAM_ISP,
"No active/wait req for ctx: %u on link: 0x%x", "No active/wait req for ctx: %u on link: 0x%x start from pending",
ctx->ctx_id, ctx->link_hdl); ctx->ctx_id, ctx->link_hdl);
rc = -EINVAL; rc = 0;
goto end; goto end;
} }
} }
@@ -3569,6 +3569,12 @@ static int __cam_isp_ctx_handle_recovery_req_util(
struct cam_ctx_request *req_to_reapply = NULL; struct cam_ctx_request *req_to_reapply = NULL;
struct cam_isp_ctx_req *req_isp = NULL; struct cam_isp_ctx_req *req_isp = NULL;
if (list_empty(&ctx->pending_req_list)) {
CAM_WARN(CAM_ISP,
"No pending request to recover from on ctx: %u", ctx->ctx_id);
return -EINVAL;
}
req_to_reapply = list_first_entry(&ctx->pending_req_list, req_to_reapply = list_first_entry(&ctx->pending_req_list,
struct cam_ctx_request, list); struct cam_ctx_request, list);
req_isp = (struct cam_isp_ctx_req *)req_to_reapply->req_priv; req_isp = (struct cam_isp_ctx_req *)req_to_reapply->req_priv;
@@ -7902,9 +7908,6 @@ static int __cam_isp_ctx_apply_default_settings(
struct cam_isp_context *ctx_isp = struct cam_isp_context *ctx_isp =
(struct cam_isp_context *) ctx->ctx_priv; (struct cam_isp_context *) ctx->ctx_priv;
if ((!ctx_isp->use_default_apply) && !(atomic_read(&ctx_isp->internal_recovery_set)))
return 0;
if (!(apply->trigger_point & ctx_isp->subscribe_event)) { if (!(apply->trigger_point & ctx_isp->subscribe_event)) {
CAM_WARN(CAM_ISP, CAM_WARN(CAM_ISP,
"Trigger: %u not subscribed for: %u", "Trigger: %u not subscribed for: %u",
@@ -7919,26 +7922,29 @@ static int __cam_isp_ctx_apply_default_settings(
if (atomic_read(&ctx_isp->internal_recovery_set)) if (atomic_read(&ctx_isp->internal_recovery_set))
return __cam_isp_ctx_reset_and_recover(false, ctx); return __cam_isp_ctx_reset_and_recover(false, ctx);
CAM_DBG(CAM_ISP, if (ctx_isp->use_default_apply) {
"Enter: apply req in Substate:%d request _id:%lld ctx:%u on link:0x%x", CAM_DBG(CAM_ISP,
ctx_isp->substate_activated, apply->request_id, "Enter: apply req in Substate:%d request _id:%lld ctx:%u on link:0x%x",
ctx->ctx_id, ctx->link_hdl); ctx_isp->substate_activated, apply->request_id,
ctx->ctx_id, ctx->link_hdl);
ctx_ops = &ctx_isp->substate_machine[ ctx_ops = &ctx_isp->substate_machine[
ctx_isp->substate_activated]; ctx_isp->substate_activated];
if (ctx_ops->crm_ops.notify_frame_skip) { if (ctx_ops->crm_ops.notify_frame_skip) {
rc = ctx_ops->crm_ops.notify_frame_skip(ctx, apply); rc = ctx_ops->crm_ops.notify_frame_skip(ctx, apply);
} else { } else {
CAM_WARN_RATE_LIMIT(CAM_ISP, CAM_WARN_RATE_LIMIT(CAM_ISP,
"No handle function in activated substate %d", "No handle function in activated substate %d",
ctx_isp->substate_activated); ctx_isp->substate_activated);
rc = -EFAULT; rc = -EFAULT;
}
if (rc)
CAM_WARN_RATE_LIMIT(CAM_ISP,
"Apply default failed in active substate %d rc %d",
ctx_isp->substate_activated, rc);
} }
if (rc)
CAM_WARN_RATE_LIMIT(CAM_ISP,
"Apply default failed in active substate %d rc %d",
ctx_isp->substate_activated, rc);
return rc; return rc;
} }