Merge "msm: camera: isp: Preserve the default min hbi value." into dev/msm-4.9-camx (db6b8302) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1395,8 +1395,12 @@ static int cam_ife_csid_init_config_ipp_path(
		cam_io_w_mb(val, soc_info->reg_map[0].mem_base +
		csid_reg->ipp_reg->csid_ipp_cfg0_addr);

		val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
		csid_reg->ipp_reg->csid_ipp_cfg1_addr);

		/* select the post irq sub sample strobe for time stamp capture */
		cam_io_w_mb(CSID_TIMESTAMP_STB_POST_IRQ, soc_info->reg_map[0].mem_base +
		val \|= CSID_TIMESTAMP_STB_POST_IRQ;
		cam_io_w_mb(val, soc_info->reg_map[0].mem_base +
		csid_reg->ipp_reg->csid_ipp_cfg1_addr);

		if (path_data->crop_enable) {