Merge "msm: ais: acquire init_frame_drop from userspace"

This commit is contained in:
qctecmdr 2020-07-04 17:59:48 -07:00 committed by Gerrit - the friendly Code Review server
commit 2d03b3fcfb
3 changed files with 3 additions and 3 deletions

View File

@ -570,6 +570,7 @@ static int ais_ife_csid_config_rdi_path(
path_cfg->end_line = res->in_cfg.crop_bottom;
path_cfg->decode_fmt = res->in_cfg.decode_format;
path_cfg->plain_fmt = res->in_cfg.pack_type;
path_cfg->init_frame_drop = res->in_cfg.init_frame_drop;
if (path_cfg->decode_fmt == 0xF)
path_cfg->pix_enable = false;
@ -822,8 +823,6 @@ static int ais_ife_csid_enable_rdi_path(
csid_reg = csid_hw->csid_info->csid_reg;
soc_info = &csid_hw->hw_info->soc_info;
path_data = &csid_hw->rdi_cfg[id];
path_data->init_frame_drop = 1;
path_data->sof_cnt = 0;
/* Enable the required RDI interrupts */

View File

@ -270,6 +270,7 @@ struct ais_ife_rdi_in_cfg {
uint32_t crop_bottom;
uint32_t crop_left;
uint32_t crop_right;
uint32_t init_frame_drop;
uint32_t reserved;
};

View File

@ -1137,7 +1137,7 @@ static int ais_vfe_dispatch_irq(struct cam_hw_info *vfe_hw,
core_info = (struct ais_vfe_hw_core_info *)vfe_hw->core_info;
CAM_DBG(CAM_ISP, "VFE[%d] event %d",
core_info->vfe_idx, work_data->evt_type);
core_info->vfe_idx, p_work->evt_type);
task = cam_req_mgr_workq_get_task(core_info->workq);
if (!task) {