Merge "msm: camera: ife: Stop hardware in error" into camera-kernel.lnx.3.1 (4fa1726f) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+8 −15

Original line number	Diff line number	Diff line
		@@ -6149,6 +6149,9 @@ static int cam_ife_mgr_process_recovery_cb(void priv, void data)
		}
		}

		if (!g_ife_hw_mgr.debug_cfg.enable_recovery)
		break;

		CAM_DBG(CAM_ISP, "RESET: CSID PATH");
		for (i = 0; i < recovery_data->no_of_context; i++) {
		ctx = recovery_data->affected_ctx[i];
		@@ -6377,22 +6380,12 @@ static int cam_ife_hw_mgr_handle_hw_err(
		rc = cam_ife_hw_mgr_find_affected_ctx(&error_event_data,
		core_idx, &recovery_data);

		if (event_info->res_type == CAM_ISP_RESOURCE_VFE_OUT)
		return rc;

		if (g_ife_hw_mgr.debug_cfg.enable_recovery) {
		CAM_DBG(CAM_ISP, "IFE Mgr recovery is enabled");

		/* Trigger for recovery */
		if (event_info->err_type == CAM_VFE_IRQ_STATUS_VIOLATION)
		recovery_data.error_type = CAM_ISP_HW_ERROR_VIOLATION;
		else
		recovery_data.error_type = CAM_ISP_HW_ERROR_OVERFLOW;

		cam_ife_hw_mgr_do_error_recovery(&recovery_data);
		} else {
		CAM_DBG(CAM_ISP, "recovery is not enabled");
		rc = 0;
		}

		return rc;
		}