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-13 16:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: ope: Avoid submitting NULL request to CDM" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Haritha Chintalapati 2020-12-02 19:10:56 -08:00 • committed by Gerrit - the friendly Code Review server
commit 9d99a4fc95
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c
View file

@ -81,6 +81,11 @@ end:
return rsc_idx;
}
static bool cam_ope_is_pending_request(struct cam_ope_ctx *ctx_data)
{
return !bitmap_empty(ctx_data->bitmap, CAM_CTX_REQ_MAX);
}
static int cam_ope_mgr_process_cmd(void *priv, void *data)
{
int rc;
@ -96,14 +101,16 @@ static int cam_ope_mgr_process_cmd(void *priv, void *data)
ctx_data = priv;
task_data = (struct ope_cmd_work_data *)data;
mutex_lock(&hw_mgr->hw_mgr_mutex);
cdm_cmd = task_data->data;
if (!cdm_cmd) {
CAM_ERR(CAM_OPE, "Invalid params%pK", cdm_cmd);
mutex_unlock(&hw_mgr->hw_mgr_mutex);
return -EINVAL;
}
mutex_lock(&hw_mgr->hw_mgr_mutex);
if (ctx_data->ctx_state != OPE_CTX_STATE_ACQUIRED) {
mutex_unlock(&hw_mgr->hw_mgr_mutex);
CAM_ERR(CAM_OPE, "ctx id :%u is not in use",
@ -119,6 +126,13 @@ static int cam_ope_mgr_process_cmd(void *priv, void *data)
return -EINVAL;
}
if (!cam_ope_is_pending_request(ctx_data)) {
CAM_WARN(CAM_OPE, "no pending req, req %lld last flush %lld",
task_data->req_id, ctx_data->last_flush_req);
mutex_unlock(&hw_mgr->hw_mgr_mutex);
return -EINVAL;
}
CAM_DBG(CAM_OPE,
"cam_cdm_submit_bls: handle 0x%x, ctx_id %d req %d cookie %d",
ctx_data->ope_cdm.cdm_handle, ctx_data->ctx_id,
@ -256,11 +270,6 @@ static int cam_ope_mgr_reapply_config(struct cam_ope_hw_mgr *hw_mgr,
return rc;
}
static bool cam_ope_is_pending_request(struct cam_ope_ctx *ctx_data)
{
return !bitmap_empty(ctx_data->bitmap, CAM_CTX_REQ_MAX);
}
static int cam_get_valid_ctx_id(void)
{
struct cam_ope_hw_mgr *hw_mgr = ope_hw_mgr;