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

Commit 428fa6c4 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: correct some logic to enable rdi only context"

parents 60cc8a01 e1085d7f

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+1 −3
Original line number Diff line number Diff line
@@ -4958,9 +4958,7 @@ static int cam_ife_hw_mgr_handle_eof_for_camif_hw_res( 
	list_for_each_entry(isp_ife_camif_res,

		&ife_hwr_mgr_ctx->res_list_ife_src, list) {



		if ((isp_ife_camif_res->res_type ==

			CAM_IFE_HW_MGR_RES_UNINIT) ||

			(isp_ife_camif_res->res_id != CAM_ISP_HW_VFE_IN_CAMIF))

		if (isp_ife_camif_res->res_type == CAM_IFE_HW_MGR_RES_UNINIT)

			continue;



		hw_res_left = isp_ife_camif_res->hw_res[0];

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static uint32_t camif_irq_err_reg_mask[CAM_IFE_IRQ_REGISTERS_MAX] = { 


static uint32_t rdi_irq_reg_mask[CAM_IFE_IRQ_REGISTERS_MAX] = {

	0x38E00000,

	0xFFF00000,

	0xFFF0,

	0x00000000,

};

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

+1 −1
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ static int cam_vfe_bus_ver3_handle_rup_bottom_half(void *handler_priv, 
	payload = evt_payload_priv;

	irq_status0 = payload->irq_reg_val[CAM_IFE_IRQ_BUS_VER3_REG_STATUS0];



	if (irq_status0 & 0x01) {

	if (irq_status0 & 0x3F) {

		CAM_DBG(CAM_ISP, "Received REG_UPDATE_ACK");

		ret = CAM_VFE_IRQ_STATUS_SUCCESS;

	}