msm: camera: isp: Update correct ife src for sfe context type

Currently, for sfe cases, we are searching for ife src corresponding
to ife rdi out resource, which is bound to fail. Add sfe rdi out
resources to map to ife src resource, which can be used in vfe top
to configure pdaf input config.

CRs-Fixed: 3149309
Change-Id: I51ca142bfa4a17ce10a18ce764799f46e029c347
Signed-off-by: Mukund Madhusudan Atre <[email protected]>

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

@@ -2307,6 +2307,31 @@ static int cam_convert_rdi_out_res_id_to_src(int res_id)
 	return CAM_ISP_HW_VFE_IN_MAX;
 }
 
+static int cam_convert_csid_rdi_res_to_ife_src(int res_id)
+{
+	enum cam_isp_hw_vfe_in_mux src_id;
+
+	switch (res_id) {
+	case CAM_IFE_PIX_PATH_RES_RDI_0:
+		src_id = CAM_ISP_HW_VFE_IN_RDI0;
+		break;
+	case CAM_IFE_PIX_PATH_RES_RDI_1:
+		src_id = CAM_ISP_HW_VFE_IN_RDI1;
+		break;
+	case CAM_IFE_PIX_PATH_RES_RDI_2:
+		src_id = CAM_ISP_HW_VFE_IN_RDI2;
+		break;
+	case CAM_IFE_PIX_PATH_RES_RDI_3:
+		src_id = CAM_ISP_HW_VFE_IN_RDI3;
+		break;
+	default:
+		src_id = CAM_ISP_HW_VFE_IN_MAX;
+		break;
+	}
+
+	return src_id;
+}
+
 static int cam_convert_csid_res_to_path(int res_id)
 {
 	if (res_id == CAM_IFE_PIX_PATH_RES_IPP)
@@ -8912,15 +8937,27 @@ static int cam_isp_update_ife_pdaf_cfg(
 	struct cam_isp_hw_mgr_res     *hw_mgr_res;
 	uint32_t                       i;
 	uint32_t                       ife_res_id;
+	enum cam_ife_pix_path_res_id   csid_path_id;
 	struct cam_isp_resource_node  *res;
 	int                            rc = -EINVAL;
 
-	ife_res_id = cam_convert_rdi_out_res_id_to_src(isp_lcr_cfg->rdi_lcr_cfg->res_id);
+	/*
+	 * For SFE cases, ife_res_id will contain corresponding input resource for vfe,
+	 * since input config is done in vfe.
+	 */
+	csid_path_id = cam_ife_hw_mgr_get_ife_csid_rdi_res_type(isp_lcr_cfg->rdi_lcr_cfg->res_id);
+	if (csid_path_id == CAM_IFE_PIX_PATH_RES_MAX) {
+		CAM_ERR(CAM_ISP, "Invalid res_id %u", isp_lcr_cfg->rdi_lcr_cfg->res_id);
+		return -EINVAL;
+	}
+
+	ife_res_id = cam_convert_csid_rdi_res_to_ife_src(csid_path_id);
 	if (ife_res_id == CAM_ISP_HW_VFE_IN_MAX) {
 		CAM_ERR(CAM_ISP, "Invalid res_id %u", isp_lcr_cfg->rdi_lcr_cfg->res_id);
 		return -EINVAL;
 	}
 
+	isp_lcr_cfg->ife_src_res_id = ife_res_id;
 	CAM_DBG(CAM_ISP, "Ctx %d res: %u lcr %u id %u ctx_type %u", ctx->ctx_index, ife_res_id,
 		isp_lcr_cfg->rdi_lcr_cfg->res_id, blob_info->base_info->idx, ctx->ctx_type);
 	list_for_each_entry(hw_mgr_res, &ctx->res_list_ife_src, list) {

drivers/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h

@@ -417,11 +417,13 @@ struct cam_isp_start_args {
  * struct cam_isp_lcr_rdi_cfg_args - isp hardware start arguments
  *
  * @rdi_lcr_cfg:            RDI LCR cfg received from User space.
+ * @ife_src_res_id:         IFE SRC res id to be used in sfe context
  * @is_init:                Flag to indicate if init packet.
  *
  */
 struct cam_isp_lcr_rdi_cfg_args {
 	struct cam_isp_lcr_rdi_config *rdi_lcr_cfg;
+	uint32_t                       ife_src_res_id;
 	bool                           is_init;
 };
 

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver4.c

@@ -153,13 +153,12 @@ static int cam_vfe_top_ver4_pdaf_lcr_config(struct cam_vfe_top_ver4_priv *top_pr
 	}
 
 	for (i = 0; i < hw_info->num_pdaf_lcr_res; i++)
-		if (cdm_args->res->res_id ==
-			hw_info->pdaf_lcr_res_mask[i].res_id)
+		if (cfg_args->ife_src_res_id == hw_info->pdaf_lcr_res_mask[i].res_id)
 			break;
 
 	if (i == hw_info->num_pdaf_lcr_res) {
-		CAM_ERR(CAM_ISP, "Res :%d is not supported for mux",
-			cfg_args->rdi_lcr_cfg->res_id);
+		CAM_ERR(CAM_ISP, "Res :%d src_res :%u is not supported for mux",
+			cfg_args->rdi_lcr_cfg->res_id, cfg_args->ife_src_res_id);
 		return -EINVAL;
 	}