Merge "msm: ais: fix 6155 crop issue on mini IFE driver" (5646e832) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/ais/ais_isp/csid_hw/ais_ife_csid_core.c

+16 −6

Original line number	Diff line number	Diff line
		@@ -677,9 +677,16 @@ static int ais_ife_csid_config_rdi_path(
		struct ais_ife_csid_path_cfg *tmp =
		&csid_hw->rdi_cfg[i];

		/*
		* doesn't compare with itself and
		* not INIT/STREAMING rdi
		*/
		if (id == i \|\|
		tmp->state < AIS_ISP_RESOURCE_STATE_INIT_HW)
		continue;

		/checking for multiple streams of same VC/
		if (i != id &&
		tmp->vc == path_cfg->vc &&
		if (tmp->vc == path_cfg->vc &&
		tmp->decode_fmt == path_cfg->decode_fmt) {
		val = path_cfg->decode_fmt <<
		csid_reg->cmn_reg->fmt_shift_val;
		@@ -784,8 +791,11 @@ static int ais_ife_csid_deinit_rdi_path(
		struct ais_ife_csid_path_cfg *tmp =
		&csid_hw->rdi_cfg[i];

		if (i != id &&
		tmp->vc == path_cfg->vc &&
		if (i == id \|\|
		tmp->state == AIS_ISP_RESOURCE_STATE_AVAILABLE)
		continue;

		if (tmp->vc == path_cfg->vc &&
		tmp->decode_fmt == path_cfg->decode_fmt)
		check_cnt++;
		}