Просмотр исходного кода

msm: camera: isp: Remove duplicate buf done warn log for dual ife

For dual ife, we add res id from both left and right ife hw to bus
comp group, and cause warn log print for duplicate buf done, we
only need add res id from left split ife hw to bus comp group.

CRs-Fixed: 3454579
Change-Id: I319ae4dcbff5f009d9a98abc020b439ac4eac55b
Signed-off-by: chengxue <[email protected]>
chengxue 2 лет назад
Родитель
Сommit
b36951a1e7
1 измененных файлов с 14 добавлено и 10 удалено
  1. 14 10
      drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+ 14 - 10
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

@@ -2197,11 +2197,13 @@ static int cam_ife_hw_mgr_acquire_res_ife_out_pixel(
 
 			ife_out_res->hw_res[j] =
 				vfe_acquire.vfe_out.rsrc_node;
-			index = vfe_acquire.vfe_out.comp_grp_id;
-			comp_grp = &ife_ctx->vfe_bus_comp_grp[index];
-			comp_grp->res_id[comp_grp->num_res] =
-				ife_out_res->hw_res[j]->res_id;
-			comp_grp->num_res++;
+			if (j == CAM_ISP_HW_SPLIT_LEFT) {
+				index = vfe_acquire.vfe_out.comp_grp_id;
+				comp_grp = &ife_ctx->vfe_bus_comp_grp[index];
+				comp_grp->res_id[comp_grp->num_res] =
+					ife_out_res->hw_res[j]->res_id;
+				comp_grp->num_res++;
+			}
 
 			CAM_DBG(CAM_ISP, "resource type:0x%x res id:0x%x comp grp id:%d ctx:%u",
 				ife_out_res->hw_res[j]->res_type,
@@ -2395,11 +2397,13 @@ static int cam_ife_hw_mgr_acquire_res_sfe_out_pix(
 
 			sfe_out_res->hw_res[j] =
 				sfe_acquire.sfe_out.rsrc_node;
-			index = sfe_acquire.sfe_out.comp_grp_id;
-			comp_grp = &ife_ctx->sfe_bus_comp_grp[index];
-			comp_grp->res_id[comp_grp->num_res] =
-				sfe_out_res->hw_res[j]->res_id;
-			comp_grp->num_res++;
+			if (j == CAM_ISP_HW_SPLIT_LEFT) {
+				index = sfe_acquire.sfe_out.comp_grp_id;
+				comp_grp = &ife_ctx->sfe_bus_comp_grp[index];
+				comp_grp->res_id[comp_grp->num_res] =
+					sfe_out_res->hw_res[j]->res_id;
+				comp_grp->num_res++;
+			}
 
 			CAM_DBG(CAM_ISP,
 				"ctx:%u res_type:0x%x res: %s res id:0x%x comp grp id:%d",