浏览代码

msm: camera: isp: Transfer rightly hw err info from ife to isp ctx

When check CSID frame size err, is not bus overflow, result in
the err event data don't get error type info and can't transfer
hw err info rightly from ife hw to isp ctx. So first let err 
event data get err type info.

CRs-Fixed: 3500372
Change-Id: Ia90a8c28028ae63174d30d2513e6d1f042810d43
Signed-off-by: Wang Kan <[email protected]>
Wang Kan 2 年之前
父节点
当前提交
1b68e6ed94
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+ 1 - 2
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

@@ -13698,6 +13698,7 @@ static int cam_ife_hw_mgr_handle_csid_error(
 	/* Default error types */
 	recovery_data.error_type = CAM_ISP_HW_ERROR_OVERFLOW;
 	error_event_data.error_type = CAM_ISP_HW_ERROR_CSID_FATAL;
+	error_event_data.error_type |= err_type;
 
 	/* Notify IFE/SFE devices, determine bus overflow */
 	if (err_type & (CAM_ISP_HW_ERROR_CSID_OUTPUT_FIFO_OVERFLOW |
@@ -13708,7 +13709,6 @@ static int cam_ife_hw_mgr_handle_csid_error(
 			ctx, &is_bus_overflow);
 
 	if (err_type & CAM_ISP_NON_RECOVERABLE_CSID_ERRORS) {
-		error_event_data.error_type |= err_type;
 		recovery_data.error_type = err_type;
 		recoverable = false;
 	}
@@ -13730,7 +13730,6 @@ static int cam_ife_hw_mgr_handle_csid_error(
 			event_info->hw_idx, err_type, ctx->try_recovery_cnt,
 			ctx->recovery_req_id, ctx->ctx_index);
 
-		error_event_data.error_type |= err_type;
 		recovery_data.error_type = err_type;
 	}