From bd2bdb729a4d73d4c56dfa4935b3f1bc499a39c1 Mon Sep 17 00:00:00 2001 From: Anand Ravi Date: Wed, 21 Apr 2021 12:01:12 -0700 Subject: [PATCH] msm: camera: isp: Remove crop values configuration from CSID CSID will no longer write to crop registers for all paths. UMD will configure those registers in init packet. Crop enable logic is retained. CRs-Fixed: 2929029 Change-Id: If6888d9094a6af3306c603d737b10c32918ab787 Signed-off-by: Anand Ravi --- .../isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c index 6fef0de2f2..7fad1b02c6 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c @@ -2252,22 +2252,6 @@ static int cam_ife_csid_ver2_init_config_rdi_path( cam_io_w_mb(val, mem_base + path_reg->cfg1_addr); - if (path_cfg->crop_enable) { - val = (((path_cfg->end_pixel & cmn_reg->crop_pix_start_mask) << - cmn_reg->crop_shift_val) | - (path_cfg->start_pixel & cmn_reg->crop_pix_end_mask)); - cam_io_w_mb(val, mem_base + path_reg->hcrop_addr); - CAM_DBG(CAM_ISP, "CSID:%d Horizontal crop config val: 0x%x", - csid_hw->hw_intf->hw_idx, val); - - val = (((path_cfg->end_line & cmn_reg->crop_line_start_mask) << - csid_reg->cmn_reg->crop_shift_val) | - (path_cfg->start_line & cmn_reg->crop_line_end_mask)); - cam_io_w_mb(val, mem_base + path_reg->vcrop_addr); - CAM_DBG(CAM_ISP, "CSID:%d Vertical Crop config val: 0x%x", - csid_hw->hw_intf->hw_idx, val); - } - /* set frame drop pattern to 0 and period to 1 */ cam_io_w_mb(1, mem_base + path_reg->frm_drop_period_addr); cam_io_w_mb(0, mem_base + path_reg->frm_drop_pattern_addr); @@ -2452,22 +2436,6 @@ static int cam_ife_csid_ver2_init_config_pxl_path( cam_io_w_mb(val, mem_base + path_reg->cfg1_addr); - if (path_cfg->crop_enable) { - val = (((path_cfg->end_pixel & cmn_reg->crop_pix_start_mask) << - cmn_reg->crop_shift_val) | - (path_cfg->start_pixel & cmn_reg->crop_pix_end_mask)); - cam_io_w_mb(val, mem_base + path_reg->hcrop_addr); - CAM_DBG(CAM_ISP, "CSID:%d Horizontal crop config val: 0x%x", - csid_hw->hw_intf->hw_idx, val); - - val = (((path_cfg->end_line & cmn_reg->crop_line_start_mask) << - csid_reg->cmn_reg->crop_shift_val) | - (path_cfg->start_line & cmn_reg->crop_line_end_mask)); - cam_io_w_mb(val, mem_base + path_reg->vcrop_addr); - CAM_DBG(CAM_ISP, "CSID:%d Vertical Crop config val: 0x%x", - csid_hw->hw_intf->hw_idx, val); - } - /* set frame drop pattern to 0 and period to 1 */ cam_io_w_mb(1, mem_base + path_reg->frm_drop_period_addr); cam_io_w_mb(0, mem_base + path_reg->frm_drop_pattern_addr);