Browse Source

Merge "msm: camera: isp: SFE enhancements" into camera-kernel.lnx.5.0

Haritha Chintalapati 4 years ago
parent
commit
7b2a65de04

+ 4 - 3
drivers/cam_isp/isp_hw_mgr/hw_utils/cam_isp_packet_parser.c

@@ -783,12 +783,13 @@ int cam_isp_add_io_buffers(
 			res_id_in = io_cfg[i].resource_type;
 			found = false;
 			if (!res_list_in_rd) {
-				CAM_ERR(CAM_ISP,
-				"No BUS Read supported io_cfg %d %d req:%d type:%d fence:%d",
+				CAM_DBG(CAM_ISP,
+				"No BUS Read supported hw_type %d io_cfg %d %d req:%d type:%d fence:%d",
+					hw_type,
 					prepare->packet->num_io_configs, i,
 					prepare->packet->header.request_id,
 					io_cfg[i].resource_type, io_cfg[i].fence);
-				return -EINVAL;
+				continue;
 			}
 			if (hw_type != CAM_ISP_HW_TYPE_SFE)
 				res_id_in = CAM_ISP_HW_VFE_IN_RD;

+ 1 - 1
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_top/cam_sfe_top.c

@@ -408,7 +408,7 @@ static int cam_sfe_top_set_hw_clk_rate(
 	CAM_DBG(CAM_PERF, "SFE [%u]: clk: %s idx: %d rate: %llu",
 		soc_info->index,
 		soc_info->clk_name[soc_info->src_clk_idx],
-		soc_info->src_clk_idx, top_priv->req_clk_rate);
+		soc_info->src_clk_idx, max_clk_rate);
 
 	rc = cam_soc_util_set_src_clk_rate(soc_info,
 		max_clk_rate);