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

Commit 5261fe3d authored by Harsh Shah's avatar Harsh Shah Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: isp: Set UB to equal if master slave mode 



UB policy is proportional by default which helps to avoid
overflow. But that leaves no UB left for 2nd session. Hence
equal policy is needed for master slave mode. Set it to equal
only for master slave mode so in normal usecase there is
better protection from bus overflow.

Change-Id: I4104cdd506c6e7197ba0e49e6b58d7d85231bcb1
Signed-off-by: default avatarHarsh Shah <harshs@codeaurora.org>
parent 40b49a34

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

+1 −1
Original line number Diff line number Diff line
@@ -1611,7 +1611,7 @@ static void msm_vfe40_cfg_axi_ub(struct vfe_device *vfe_dev) 
	axi_data->wm_ub_cfg_policy =

		(enum msm_wm_ub_cfg_type)vfe_dev->vfe_ub_policy;

	ISP_DBG("%s: ub_policy %d\n", __func__, axi_data->wm_ub_cfg_policy);

	axi_data->wm_ub_cfg_policy = MSM_WM_UB_EQUAL_SLICING;



	if (axi_data->wm_ub_cfg_policy == MSM_WM_UB_EQUAL_SLICING) {

		vfe_dev->ub_info->policy = MSM_WM_UB_EQUAL_SLICING;

		msm_vfe40_cfg_axi_ub_equal_slicing(vfe_dev);

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

+1 −0
Original line number Diff line number Diff line
@@ -2228,6 +2228,7 @@ static int msm_isp_update_dual_HW_ms_info_at_stop( 
		}

		src_info->dual_hw_ms_info.sof_info = NULL;

		spin_unlock(&vfe_dev->common_data->common_dev_data_lock);

		vfe_dev->vfe_ub_policy = 0;

	}



	return rc;

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

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ static int msm_isp_set_dual_HW_master_slave_mode( 


	dual_hw_ms_cmd = (struct msm_isp_set_dual_hw_ms_cmd *)arg;

	vfe_dev->common_data->ms_resource.dual_hw_type = DUAL_HW_MASTER_SLAVE;



	vfe_dev->vfe_ub_policy = MSM_WM_UB_EQUAL_SLICING;

	if (dual_hw_ms_cmd->primary_intf >= VFE_SRC_MAX) {

		pr_err("%s: Error! Invalid SRC param %d\n", __func__,

			dual_hw_ms_cmd->primary_intf);