From 4d4afb27931fdbc3bc24191095721438571c957c Mon Sep 17 00:00:00 2001 From: Alok Chauhan Date: Wed, 9 Dec 2020 18:53:23 +0530 Subject: [PATCH] msm: camera: isp: increase number of hw entries increase number of hw entries to allocate sufficient memory for cdm bl commands. CRs-Fixed: 2837487 Change-Id: Id890ab07cc66ef704a1317d545540f36dfc7f3c2 Signed-off-by: Alok Chauhan --- drivers/cam_isp/cam_isp_context.h | 5 ----- drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c | 4 +--- drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c | 3 +-- drivers/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h | 6 ++++++ 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/cam_isp/cam_isp_context.h b/drivers/cam_isp/cam_isp_context.h index 4142fd6470..fbabb598e0 100644 --- a/drivers/cam_isp/cam_isp_context.h +++ b/drivers/cam_isp/cam_isp_context.h @@ -28,11 +28,6 @@ /* max requests per ctx for isp */ #define CAM_ISP_CTX_REQ_MAX 8 -/* - * Maximum configuration entry size - This is based on the - * worst case DUAL IFE use case plus some margin. - */ -#define CAM_ISP_CTX_CFG_MAX 25 /* * Maximum entries in state monitoring array for error logging diff --git a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c index 9ee3acabc1..7d55d49f93 100644 --- a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c +++ b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c @@ -27,8 +27,6 @@ #include "cam_mem_mgr_api.h" #include "cam_common_util.h" -#define CAM_IFE_HW_ENTRIES_MAX 20 - #define CAM_IFE_SAFE_DISABLE 0 #define CAM_IFE_SAFE_ENABLE 1 #define SMMU_SE_IFE 0 @@ -11143,7 +11141,7 @@ int cam_ife_hw_mgr_init(struct cam_hw_mgr_intf *hw_mgr_intf, int *iommu_hdl) g_ife_hw_mgr.ctx_pool[i].cdm_cmd = kzalloc(((sizeof(struct cam_cdm_bl_request)) + - ((CAM_IFE_HW_ENTRIES_MAX - 1) * + ((CAM_ISP_CTX_CFG_MAX - 1) * sizeof(struct cam_cdm_bl_cmd))), GFP_KERNEL); if (!g_ife_hw_mgr.ctx_pool[i].cdm_cmd) { rc = -ENOMEM; diff --git a/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c index 9db0fd5528..f717a51c00 100644 --- a/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c +++ b/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c @@ -28,7 +28,6 @@ #include "cam_trace.h" #include "cam_compat.h" -#define CAM_TFE_HW_ENTRIES_MAX 20 #define CAM_TFE_HW_CONFIG_TIMEOUT 60 #define CAM_TFE_HW_CONFIG_WAIT_MAX_TRY 3 @@ -5801,7 +5800,7 @@ int cam_tfe_hw_mgr_init(struct cam_hw_mgr_intf *hw_mgr_intf, int *iommu_hdl) g_tfe_hw_mgr.ctx_pool[i].cdm_cmd = kzalloc(((sizeof(struct cam_cdm_bl_request)) + - ((CAM_TFE_HW_ENTRIES_MAX - 1) * + ((CAM_ISP_CTX_CFG_MAX - 1) * sizeof(struct cam_cdm_bl_cmd))), GFP_KERNEL); if (!g_tfe_hw_mgr.ctx_pool[i].cdm_cmd) { rc = -ENOMEM; diff --git a/drivers/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h b/drivers/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h index 9b0029a569..a8e535dbdc 100644 --- a/drivers/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h +++ b/drivers/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h @@ -38,6 +38,12 @@ #define CAM_IFE_CTX_CONSUME_ADDR_EN BIT(2) #define CAM_IFE_CTX_APPLY_DEFAULT_CFG BIT(3) +/* + * Maximum configuration entry size - This is based on the + * worst case DUAL IFE use case plus some margin. + */ +#define CAM_ISP_CTX_CFG_MAX 25 + /** * enum cam_isp_hw_event_type - Collection of the ISP hardware events */