| commit | 398b01230b4d29fa628ad9d30e5457db9f121cc1 | [log] [tgz] |
|---|---|---|
| author | Harsh Shah <harshs@codeaurora.org> | Thu Sep 28 15:36:39 2017 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sat Oct 07 15:53:27 2017 -0700 |
| tree | 347483b860d7351c83d8146754e980d1cca41dec | |
| parent | e458b44c87d28285169b0dfa6d11e348952e1884 [diff] [blame] |
msm: camera: isp: Add check for CSIPHY3 in CSID CSIPHY3 is hard wired to CSID hw insteance 2, so we should only acquire CSID2 if the input is PHY3. Change-Id: I66178904374c4305a056b885ae5f2460fba50407 Signed-off-by: Harsh Shah <harshs@codeaurora.org>
diff --git a/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c b/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c index 7d6e758..c5dd6ff 100644 --- a/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c +++ b/drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
@@ -627,6 +627,12 @@ goto end; } + if (cid_reserv->in_port->res_type == CAM_ISP_IFE_IN_RES_PHY_3 && + csid_hw->hw_intf->hw_idx != 2) { + rc = -EINVAL; + goto end; + } + if (csid_hw->csi2_reserve_cnt) { /* current configure res type should match requested res type */ if (csid_hw->res_type != cid_reserv->in_port->res_type) {