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

msm: camera: isp: Resume HW only when getting one valid req

Browse Source 
Variable fps usecase needs to get valid req with init packet
flag after flush, this change adds a flag to detect if we
get a valid req before resuming HW. This change also stops
the sensors during flush if useland already request to stop
dev.

CRs-Fixed: 3256139
Change-Id: Ieabd327a3b5cf380ca60548c85714c96635a272d
Signed-off-by: Depeng Shao <quic_depengs@quicinc.com>
This commit is contained in:
Depeng Shao
2022-07-22 16:54:05 +08:00
committed by Camera Software Integration
parent 0bf472ae71
commit 48d9123083
4 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/cam_isp/cam_isp_context.c
View File

@@ -5958,6 +5958,7 @@ static int __cam_isp_ctx_release_dev_in_top_state(struct cam_context *ctx,
ctx_isp->rdi_only_context = false;
ctx_isp->req_info.last_bufdone_req_id = 0;
ctx_isp->v4l2_event_sub_ids = 0;
ctx_isp->resume_hw_in_flushed = false;
atomic64_set(&ctx_isp->state_monitor_head, -1);
for (i = 0; i < CAM_ISP_CTX_EVENT_MAX; i++)
@@ -6116,6 +6117,11 @@ static int __cam_isp_ctx_config_dev_in_top_state(
if (rc)
CAM_ERR(CAM_ISP, "Enqueue INIT pkt failed");
ctx_isp->init_received = true;
if ((ctx_isp->vfps_aux_context) && (req->request_id > 0))
ctx_isp->resume_hw_in_flushed = true;
else
ctx_isp->resume_hw_in_flushed = false;
} else {
rc = -EINVAL;
CAM_ERR(CAM_ISP, "Recevied INIT pkt in wrong state:%d",
@@ -6882,6 +6888,19 @@ static int __cam_isp_ctx_config_dev_in_flushed(struct cam_context *ctx,
goto end;
}
CAM_DBG(CAM_ISP, "vfps_ctx:%s resume_hw_in_flushed:%d ctx:%d",
CAM_BOOL_TO_YESNO(ctx_isp->vfps_aux_context),
ctx_isp->resume_hw_in_flushed,
ctx->ctx_id);
if (ctx_isp->vfps_aux_context) {
/* Resume the HW only when we get first valid req */
if (!ctx_isp->resume_hw_in_flushed)
goto end;
else
ctx_isp->resume_hw_in_flushed = false;
}
hw_cmd_args.ctxt_to_hw_map = ctx_isp->hw_ctx;
hw_cmd_args.cmd_type = CAM_HW_MGR_CMD_INTERNAL;
isp_hw_cmd_args.cmd_type = CAM_ISP_HW_MGR_CMD_RESUME_HW;