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

Commit 86f7c9e4 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: Force equal slicing of UB"

parents d26c70c3 15605ece

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

+5 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define VFE40_UB_SIZE_8952 2048 /* 2048 * 128 bits = 32KB */

#define VFE40_UB_SIZE_8916 3072 /* 3072 * 128 bits = 48KB */

#define VFE40_EQUAL_SLICE_UB 190 /* (UB_SIZE - STATS SIZE)/6 */

#define VFE40_EQUAL_SLICE_UB_8916 276

#define VFE40_EQUAL_SLICE_UB_8916 236

#define VFE40_TOTAL_WM_UB 1144 /* UB_SIZE - STATS SIZE */

#define VFE40_TOTAL_WM_UB_8916 1656

#define VFE40_WM_BASE(idx) (0x6C + 0x24 * idx)
@@ -1580,7 +1580,8 @@ static void msm_vfe40_cfg_axi_ub_equal_slicing( 
	uint32_t equal_slice_ub;

	struct msm_vfe_axi_shared_data *axi_data = &vfe_dev->axi_data;



	if (vfe_dev->vfe_hw_version == VFE40_8916_VERSION) {

	if (vfe_dev->vfe_hw_version == VFE40_8916_VERSION ||

		vfe_dev->vfe_hw_version == VFE40_8952_VERSION) {

		vfe_dev->ub_info->wm_ub = VFE40_EQUAL_SLICE_UB_8916;

		equal_slice_ub = VFE40_EQUAL_SLICE_UB_8916;

	} else {
@@ -1604,6 +1605,8 @@ static void msm_vfe40_cfg_axi_ub(struct vfe_device *vfe_dev) 
	struct msm_vfe_axi_shared_data *axi_data = &vfe_dev->axi_data;

	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);