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

Merge "msm: camera: isp: Reinit completion before issuing path reset" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Haritha Chintalapati
2021-04-01 21:08:34 -07:00
committed by Gerrit - the friendly Code Review server
parent 53e46fdafa 0a26ed8228
commit b92699ea3a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver1.c
View File

@@ -647,15 +647,14 @@ static int cam_ife_csid_path_reset(
val = cam_io_r_mb(soc_info->reg_map[0].mem_base + val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
path_reg->irq_mask_addr); path_reg->irq_mask_addr);
val |= 1 << csid_reg->cmn_reg->rst_done_shift_val; val |= 1 << csid_reg->cmn_reg->rst_done_shift_val;
irq_reg = cam_ife_csid_convert_res_to_irq_reg(res->res_id);
reinit_completion(&csid_hw->irq_complete[irq_reg]);
cam_io_w_mb(val, soc_info->reg_map[0].mem_base + cam_io_w_mb(val, soc_info->reg_map[0].mem_base +
path_reg->irq_mask_addr); path_reg->irq_mask_addr);
cam_io_w_mb(csid_reg->cmn_reg->path_rst_stb_all, cam_io_w_mb(csid_reg->cmn_reg->path_rst_stb_all,
soc_info->reg_map[0].mem_base + path_reg->rst_strobes_addr); soc_info->reg_map[0].mem_base + path_reg->rst_strobes_addr);
irq_reg = cam_ife_csid_convert_res_to_irq_reg(res->res_id);
reinit_completion(&csid_hw->irq_complete[irq_reg]);
rem_jiffies = cam_common_wait_for_completion_timeout( rem_jiffies = cam_common_wait_for_completion_timeout(
&csid_hw->irq_complete[irq_reg], &csid_hw->irq_complete[irq_reg],
msecs_to_jiffies(IFE_CSID_TIMEOUT)); msecs_to_jiffies(IFE_CSID_TIMEOUT));