From 81360e9bfae1fda53d7339f2cb80330add68b827 Mon Sep 17 00:00:00 2001 From: Shravya Samala Date: Thu, 25 Mar 2021 23:28:22 +0530 Subject: [PATCH] msm: camera: isp: Dont enable Wm configurations during HW start There is a chance that during acquire time while updating write master, for few resources io buffers are not allocated. If Wm configurations are enabled without receiving io buffers then there is a chance of hitting page fault issues. This commit takes care of enabling Wm configurations for each client only if io buffers are allocated. CRs-Fixed: 2887053 Change-Id: I868bd01dbd896dd86eeec4fc92a8a62e746f79cf Signed-off-by: Shravya Samala --- .../isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c index 53436df08dfa..c5fe7d82fa0d 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c @@ -1330,10 +1330,9 @@ static int cam_vfe_bus_start_wm( return -EINVAL; } } - - /* Enable WM */ - cam_io_w_mb(rsrc_data->en_cfg, common_data->mem_base + - rsrc_data->hw_regs->cfg); + /* enabling Wm configuratons are taken care in update_wm(). + * i.e enable wm only if io buffers are allocated + */ CAM_DBG(CAM_ISP, "WM res %d width = %d, height = %d", rsrc_data->index, rsrc_data->width, rsrc_data->height);