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

Commit 2c54ebe1 authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Reset sof counter before enable the CSID path" into dev/msm-4.14-camx

parents c1577e4d 09643004

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

+3 −0
Original line number Diff line number Diff line
@@ -1890,10 +1890,12 @@ static int cam_ife_csid_enable_pxl_path( 
		is_ipp = true;

		pxl_reg = csid_reg->ipp_reg;

		path_config = &(csid_hw->ipp_path_config);

		csid_hw->res_sof_cnt[CAM_IFE_PIX_PATH_RES_IPP] = 0;

	} else {

		is_ipp = false;

		pxl_reg = csid_reg->ppp_reg;

		path_config = &(csid_hw->ppp_path_config);

		csid_hw->res_sof_cnt[CAM_IFE_PIX_PATH_RES_PPP] = 0;

	}



	if (res->res_state != CAM_ISP_RESOURCE_STATE_INIT_HW) {
@@ -2294,6 +2296,7 @@ static int cam_ife_csid_enable_rdi_path( 
			res->res_type, res->res_id, res->res_state);

		return -EINVAL;

	}

	csid_hw->res_sof_cnt[res->res_id] = 0;



	if (path_data->usage_type)

		path_data->init_frame_drop = csid_hw->init_frame_drop + 1;