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

Commit 8112aec2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents d708ed56 5261fe3d

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
@@ -2273,6 +2273,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
@@ -700,7 +700,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);