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

Commit ab65669d authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Select epoch config based on Hardware" into dev/msm-4.9-camx

parents 3b30cb15 de5bfb49

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

+45 −9
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ static int cam_vfe_camif_resource_start( 
	uint32_t                             epoch0_irq_mask;

	uint32_t                             epoch1_irq_mask;

	uint32_t                             computed_epoch_line_cfg;

	uint32_t                             camera_hw_version = 0;

	int                                  rc = 0;



	if (!camif_res) {

		CAM_ERR(CAM_ISP, "Error! Invalid input arguments");
@@ -250,16 +252,50 @@ static int cam_vfe_camif_resource_start( 
		rsrc_data->common_reg->module_ctrl[

		CAM_VFE_TOP_VER2_MODULE_STATS]->cgc_ovd);



	/* get the HW version */

	rc = cam_cpas_get_cpas_hw_version(&camera_hw_version);



	if (rc) {

		CAM_ERR(CAM_ISP, "Couldn't find HW version. rc: %d", rc);

		return rc;

	}



	/* epoch config */

	epoch0_irq_mask = ((rsrc_data->last_line - rsrc_data->first_line) / 2) +

	switch (camera_hw_version) {

	case CAM_CPAS_TITAN_175_V101:

	case CAM_CPAS_TITAN_175_V100:

		epoch0_irq_mask = ((rsrc_data->last_line -

				rsrc_data->first_line) / 2) +

				rsrc_data->first_line;

	epoch1_irq_mask = rsrc_data->reg_data->epoch_line_cfg & 0xFFFF;

	computed_epoch_line_cfg = (epoch0_irq_mask << 16) | epoch1_irq_mask;

		epoch1_irq_mask = rsrc_data->reg_data->epoch_line_cfg &

				0xFFFF;

		computed_epoch_line_cfg = (epoch0_irq_mask << 16) |

				epoch1_irq_mask;

		cam_io_w_mb(computed_epoch_line_cfg,

		rsrc_data->mem_base + rsrc_data->camif_reg->epoch_irq);

	CAM_DBG(CAM_ISP, "first_line:%u last_line:%u epoch_line_cfg: 0x%x",

		rsrc_data->first_line, rsrc_data->last_line,

				rsrc_data->mem_base +

				rsrc_data->camif_reg->epoch_irq);

		CAM_DBG(CAM_ISP, "first_line: %u\n"

				"last_line: %u\n"

				"epoch_line_cfg: 0x%x",

				rsrc_data->first_line,

				rsrc_data->last_line,

				computed_epoch_line_cfg);

		break;

	case CAM_CPAS_TITAN_170_V100:

	case CAM_CPAS_TITAN_170_V110:

	case CAM_CPAS_TITAN_170_V120:

		cam_io_w_mb(rsrc_data->reg_data->epoch_line_cfg,

				rsrc_data->mem_base +

				rsrc_data->camif_reg->epoch_irq);

		break;

	default:

		cam_io_w_mb(rsrc_data->reg_data->epoch_line_cfg,

				rsrc_data->mem_base +

				rsrc_data->camif_reg->epoch_irq);

		CAM_WARN(CAM_ISP, "Hardware version not proper: 0x%x",

				camera_hw_version);

		break;

	}



	camif_res->res_state = CAM_ISP_RESOURCE_STATE_STREAMING;