Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eec266b7 authored by Harsh Shah's avatar Harsh Shah
Browse files

msm: camera: isp: Remove update of framedrop and IRQ subsampling 



Framedrop update and IRQ subsampling update is moved to HFR blob
update from buffer config. So remove it from update_buf()to avoid
incorrect updates.

Change-Id: I85e2dddf1ee6141dbd44a0671d5281562ca8c4d5
Signed-off-by: default avatarHarsh Shah <harshs@codeaurora.org>
parent bad83c59

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c

+0 −43
Original line number Diff line number Diff line
@@ -2389,49 +2389,6 @@ static int cam_vfe_bus_update_wm(void *priv, void *cmd_args, 
				wm_data->index, reg_val_pair[j-1]);

		}



		if (wm_data->framedrop_pattern != io_cfg->framedrop_pattern ||

			!wm_data->hfr_cfg_done) {

			CAM_VFE_ADD_REG_VAL_PAIR(reg_val_pair, j,

				wm_data->hw_regs->framedrop_pattern,

				io_cfg->framedrop_pattern);

			wm_data->framedrop_pattern = io_cfg->framedrop_pattern;

			CAM_DBG(CAM_ISP, "WM %d framedrop pattern 0x%x",

				wm_data->index, reg_val_pair[j-1]);

		}





		if (wm_data->framedrop_period != io_cfg->framedrop_period ||

			!wm_data->hfr_cfg_done) {

			CAM_VFE_ADD_REG_VAL_PAIR(reg_val_pair, j,

				wm_data->hw_regs->framedrop_period,

				io_cfg->framedrop_period);

			wm_data->framedrop_period = io_cfg->framedrop_period;

			CAM_DBG(CAM_ISP, "WM %d framedrop period 0x%x",

				wm_data->index, reg_val_pair[j-1]);

		}



		if (wm_data->irq_subsample_period != io_cfg->subsample_period

			|| !wm_data->hfr_cfg_done) {

			CAM_VFE_ADD_REG_VAL_PAIR(reg_val_pair, j,

				wm_data->hw_regs->irq_subsample_period,

				io_cfg->subsample_period);

			wm_data->irq_subsample_period =

				io_cfg->subsample_period;

			CAM_DBG(CAM_ISP, "WM %d irq subsample period 0x%x",

				wm_data->index, reg_val_pair[j-1]);

		}



		if (wm_data->irq_subsample_pattern != io_cfg->subsample_pattern

			|| !wm_data->hfr_cfg_done) {

			CAM_VFE_ADD_REG_VAL_PAIR(reg_val_pair, j,

				wm_data->hw_regs->irq_subsample_pattern,

				io_cfg->subsample_pattern);

			wm_data->irq_subsample_pattern =

				io_cfg->subsample_pattern;

			CAM_DBG(CAM_ISP, "WM %d irq subsample pattern 0x%x",

				wm_data->index, reg_val_pair[j-1]);

		}



		if (wm_data->en_ubwc) {

			if (!wm_data->hw_regs->ubwc_regs) {

				CAM_ERR(CAM_ISP,