samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forka 0
Codice Problemi Pull Requests Actions Pacchetti Progetti Rilasci Wiki Attività

Merge "msm: camera: isp: Acquire PIX ports for SFE sHDR use-case" into camera-kernel.lnx.5.0

Sfoglia il codice sorgente
This commit is contained in:
Haritha Chintalapati
2021-01-19 15:06:41 -08:00
committato da Gerrit - the friendly Code Review server
parent 13e1220c4f 73aed57a59
commit 0784563e0c
1 ha cambiato i file con 10 aggiunte e 15 eliminazioni
Scarica il file Patch Scarica il file Diff Expand all files Collapse all files

23
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
Vedi File

@@ -1769,20 +1769,6 @@ static int cam_ife_hw_mgr_acquire_res_sfe_out(
int rc = -EINVAL; int rc = -EINVAL;
struct cam_isp_hw_mgr_res *sfe_res_iterator; struct cam_isp_hw_mgr_res *sfe_res_iterator;
if (!list_empty(&ife_ctx->res_list_ife_in_rd)) {
sfe_res_iterator = list_first_entry(
&ife_ctx->res_list_ife_in_rd,
struct cam_isp_hw_mgr_res, list);
if (sfe_res_iterator->num_children)
goto out_for_sfe_src;
rc = cam_ife_hw_mgr_acquire_res_sfe_out_pix(
ife_ctx, sfe_res_iterator, in_port);
if (rc)
goto err;
}
out_for_sfe_src:
list_for_each_entry(sfe_res_iterator, list_for_each_entry(sfe_res_iterator,
&ife_ctx->res_list_sfe_src, list) { &ife_ctx->res_list_sfe_src, list) {
if (sfe_res_iterator->num_children) if (sfe_res_iterator->num_children)
@@ -1796,6 +1782,15 @@ out_for_sfe_src:
case CAM_ISP_HW_SFE_IN_RDI0: case CAM_ISP_HW_SFE_IN_RDI0:
case CAM_ISP_HW_SFE_IN_RDI1: case CAM_ISP_HW_SFE_IN_RDI1:
case CAM_ISP_HW_SFE_IN_RDI2: case CAM_ISP_HW_SFE_IN_RDI2:
/* for sHDR acquire both RDI and PIX ports */
rc = cam_ife_hw_mgr_acquire_res_sfe_out_rdi(ife_ctx,
sfe_res_iterator, in_port);
if (rc)
goto err;
rc = cam_ife_hw_mgr_acquire_res_sfe_out_pix(ife_ctx,
sfe_res_iterator, in_port);
break;
case CAM_ISP_HW_SFE_IN_RDI3: case CAM_ISP_HW_SFE_IN_RDI3:
case CAM_ISP_HW_SFE_IN_RDI4: case CAM_ISP_HW_SFE_IN_RDI4:
rc = cam_ife_hw_mgr_acquire_res_sfe_out_rdi(ife_ctx, rc = cam_ife_hw_mgr_acquire_res_sfe_out_rdi(ife_ctx,