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

Commit 2575340a authored by taojiang's avatar taojiang Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: enable dual camera concurrency 



1. There is only one combo csiphy for msm8909,so the single
   csiphy should be initialed twice when two camera started simultaneously.
2. Each stream must configure its own UB respectively,because the length
   and offset of each stream buffer may not be identical.

Change-Id: I0bae42632a47518132384d923774232a4a6afdec
Signed-off-by: default avatarTao Jiang <taojiang@codeaurora.org>
parent f3ca09d2

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util_32.c

+2 −5
Original line number Diff line number Diff line
@@ -1602,6 +1602,8 @@ static int msm_isp_start_axi_stream(struct vfe_device *vfe_dev, 
	vfe_dev->hw_info->vfe_ops.core_ops.reg_update(vfe_dev, 0xF);

	msm_isp_update_camif_output_count(vfe_dev, stream_cfg_cmd);

	msm_isp_update_rdi_output_count(vfe_dev, stream_cfg_cmd);

	/*Configure UB*/

	vfe_dev->hw_info->vfe_ops.axi_ops.cfg_ub(vfe_dev);

	if (camif_update == ENABLE_CAMIF) {

		atomic_set(&vfe_dev->error_info.overflow_state,

				NO_OVERFLOW);
@@ -1735,7 +1737,6 @@ int msm_isp_cfg_axi_stream(struct vfe_device *vfe_dev, void *arg) 
{

	int rc = 0;

	struct msm_vfe_axi_stream_cfg_cmd *stream_cfg_cmd = arg;

	struct msm_vfe_axi_shared_data *axi_data = &vfe_dev->axi_data;

	enum msm_isp_camif_update_state camif_update;



	rc = msm_isp_axi_check_stream_state(vfe_dev, stream_cfg_cmd);
@@ -1744,10 +1745,6 @@ int msm_isp_cfg_axi_stream(struct vfe_device *vfe_dev, void *arg) 
		return rc;

	}



	if (axi_data->num_active_stream == 0) {

		/*Configure UB*/

		vfe_dev->hw_info->vfe_ops.axi_ops.cfg_ub(vfe_dev);

	}

	camif_update = msm_isp_get_camif_update_state(vfe_dev, stream_cfg_cmd);



	if (stream_cfg_cmd->cmd == START_STREAM) {

drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c

+1 −3
Original line number Diff line number Diff line
@@ -1706,10 +1706,8 @@ static int msm_csiphy_init(struct csiphy_device *csiphy_dev) 


	CDBG("%s:%d called\n", __func__, __LINE__);

	if (csiphy_dev->csiphy_state == CSIPHY_POWER_UP) {

		pr_err("%s: csiphy invalid state %d\n", __func__,

		pr_err("%s: csiphy current state %d\n", __func__,

			csiphy_dev->csiphy_state);

		rc = -EINVAL;

		return rc;

	}



	CDBG("%s:%d called\n", __func__, __LINE__);