浏览代码

msm: camera: isp: Fix condition for IFE fetch engine probe

Starting Waipio fetch engine is part of SFE HW block. During
IFE probe check against version to ensure it's probed only
if it exists. Update IFE HW idx in MMU prefetch log.

CRs-Fixed: 2841729
Change-Id: If6b28413fc0fe80e767e41521f244f5fbf99a334
Signed-off-by: Karthik Anantha Ram <[email protected]>
Karthik Anantha Ram 4 年之前
父节点
当前提交
0a9054daba

+ 2 - 2
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.c

@@ -614,8 +614,8 @@ int cam_vfe_core_init(struct cam_vfe_hw_core_info  *core_info,
 		goto deinit_top;
 		goto deinit_top;
 	}
 	}
 
 
-	/* Read Bus is not valid for vfe-lite */
-	if (!soc_private->is_ife_lite) {
+	/* Probe fetch engine only if it exists - 0x0 is not a valid version */
+	if (vfe_hw_info->bus_rd_version) {
 		rc = cam_vfe_bus_init(vfe_hw_info->bus_rd_version, BUS_TYPE_RD,
 		rc = cam_vfe_bus_init(vfe_hw_info->bus_rd_version, BUS_TYPE_RD,
 			soc_info, hw_intf, vfe_hw_info->bus_rd_hw_info,
 			soc_info, hw_intf, vfe_hw_info->bus_rd_hw_info,
 			core_info->vfe_irq_controller, &core_info->vfe_rd_bus);
 			core_info->vfe_irq_controller, &core_info->vfe_rd_bus);

+ 2 - 1
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c

@@ -3853,7 +3853,8 @@ static int cam_vfe_bus_ver3_process_cmd(
 		bus_priv = (struct cam_vfe_bus_ver3_priv  *) priv;
 		bus_priv = (struct cam_vfe_bus_ver3_priv  *) priv;
 		bus_priv->common_data.disable_mmu_prefetch =
 		bus_priv->common_data.disable_mmu_prefetch =
 			(*((bool *)cmd_args));
 			(*((bool *)cmd_args));
-		CAM_DBG(CAM_ISP, "IFE bus WR prefetch %s",
+		CAM_DBG(CAM_ISP, "IFE: %u bus WR prefetch %s",
+			bus_priv->common_data.core_index,
 			bus_priv->common_data.disable_mmu_prefetch ?
 			bus_priv->common_data.disable_mmu_prefetch ?
 			"disabled" : "enabled");
 			"disabled" : "enabled");
 		rc = 0;
 		rc = 0;