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-09 21:59:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: isp: Handle QCFA bin eanbled case for MP limit fuse" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Haritha Chintalapati 2020-11-06 17:23:44 -08:00 • committed by Gerrit - the friendly Code Review server
commit cdb34b148c
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
View file

@ -1143,6 +1143,7 @@ int cam_ife_csid_path_reserve(struct cam_ife_csid_hw *csid_hw,
struct cam_ife_csid_path_cfg *path_data;
struct cam_isp_resource_node *res;
bool is_rdi = false;
uint32_t width = 0;
/* CSID CSI2 v2.0 supports 31 vc */
if (reserve->sync_mode >= CAM_ISP_HW_SYNC_MAX) {
@ -1313,10 +1314,13 @@ int cam_ife_csid_path_reserve(struct cam_ife_csid_hw *csid_hw,
}
if (reserve->sync_mode == CAM_ISP_HW_SYNC_MASTER) {
width = reserve->in_port->left_stop -
reserve->in_port->left_start + 1;
if (path_data->horizontal_bin || path_data->qcfa_bin)
width /= 2;
if ((reserve->res_id == CAM_IFE_PIX_PATH_RES_IPP) &&
!(cam_ife_csid_is_resolution_supported(csid_hw,
reserve->in_port->left_stop -
reserve->in_port->left_start + 1))) {
width))) {
rc = -EINVAL;
goto end;
}
@ -1339,10 +1343,13 @@ int cam_ife_csid_path_reserve(struct cam_ife_csid_hw *csid_hw,
csid_hw->hw_intf->hw_idx, reserve->res_id,
path_data->start_line, path_data->end_line);
} else if (reserve->sync_mode == CAM_ISP_HW_SYNC_SLAVE) {
width = reserve->in_port->right_stop -
reserve->in_port->right_start + 1;
if (path_data->horizontal_bin || path_data->qcfa_bin)
width /= 2;
if ((reserve->res_id == CAM_IFE_PIX_PATH_RES_IPP) &&
!(cam_ife_csid_is_resolution_supported(csid_hw,
reserve->in_port->right_stop -
reserve->in_port->right_start + 1))) {
width))) {
rc = -EINVAL;
goto end;
}
@ -1362,10 +1369,13 @@ int cam_ife_csid_path_reserve(struct cam_ife_csid_hw *csid_hw,
csid_hw->hw_intf->hw_idx, reserve->res_id,
path_data->start_line, path_data->end_line);
} else {
width = reserve->in_port->left_stop -
reserve->in_port->left_start + 1;
if (path_data->horizontal_bin || path_data->qcfa_bin)
width /= 2;
if ((reserve->res_id == CAM_IFE_PIX_PATH_RES_IPP) &&
!(cam_ife_csid_is_resolution_supported(csid_hw,
reserve->in_port->left_stop -
reserve->in_port->left_start + 1))) {
width))) {
rc = -EINVAL;
goto end;
}