Merge "msm: camera: icp: Reduce the device idle timer" into dev/msm-4.9-camx (0a8a5b89) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -57,6 +57,8 @@
		#define ICP_DEV_TYPE_TO_CLK_TYPE(dev_type) \
		((dev_type == CAM_ICP_RES_TYPE_BPS) ? ICP_CLK_HW_BPS : ICP_CLK_HW_IPE)

		#define ICP_DEVICE_IDLE_TIMEOUT 400

		static struct cam_icp_hw_mgr icp_hw_mgr;

		static int cam_icp_send_ubwc_cfg(struct cam_icp_hw_mgr *hw_mgr)
		@@ -549,7 +551,7 @@ static int cam_icp_device_timer_start(struct cam_icp_hw_mgr *hw_mgr)
		for (i = 0; i < ICP_CLK_HW_MAX; i++) {
		if (!hw_mgr->clk_info[i].watch_dog) {
		rc = crm_timer_init(&hw_mgr->clk_info[i].watch_dog,
		3000, &hw_mgr->clk_info[i],
		ICP_DEVICE_IDLE_TIMEOUT, &hw_mgr->clk_info[i],
		&cam_icp_device_timer_cb);

		if (rc)