samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: isp: increase number of hw entries

Browse Source 
increase number of hw entries to allocate sufficient memory
for cdm bl commands.

CRs-Fixed: 2837487
Change-Id: Id890ab07cc66ef704a1317d545540f36dfc7f3c2
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
This commit is contained in:
Alok Chauhan
2020-12-09 18:53:23 +05:30
committed by Gerrit - the friendly Code Review server
parent 37e33fb211
commit 4d4afb2793
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/cam_isp/cam_isp_context.h
View File

@@ -28,11 +28,6 @@
/* max requests per ctx for isp */ /* max requests per ctx for isp */
#define CAM_ISP_CTX_REQ_MAX 8 #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 * Maximum entries in state monitoring array for error logging

4
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
View File

@@ -27,8 +27,6 @@
#include "cam_mem_mgr_api.h" #include "cam_mem_mgr_api.h"
#include "cam_common_util.h" #include "cam_common_util.h"
#define CAM_IFE_HW_ENTRIES_MAX 20
#define CAM_IFE_SAFE_DISABLE 0 #define CAM_IFE_SAFE_DISABLE 0
#define CAM_IFE_SAFE_ENABLE 1 #define CAM_IFE_SAFE_ENABLE 1
#define SMMU_SE_IFE 0 #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 = g_ife_hw_mgr.ctx_pool[i].cdm_cmd =
kzalloc(((sizeof(struct cam_cdm_bl_request)) + 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); sizeof(struct cam_cdm_bl_cmd))), GFP_KERNEL);
if (!g_ife_hw_mgr.ctx_pool[i].cdm_cmd) { if (!g_ife_hw_mgr.ctx_pool[i].cdm_cmd) {
rc = -ENOMEM; rc = -ENOMEM;

3
drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c
View File

@@ -28,7 +28,6 @@
#include "cam_trace.h" #include "cam_trace.h"
#include "cam_compat.h" #include "cam_compat.h"
#define CAM_TFE_HW_ENTRIES_MAX 20
#define CAM_TFE_HW_CONFIG_TIMEOUT 60 #define CAM_TFE_HW_CONFIG_TIMEOUT 60
#define CAM_TFE_HW_CONFIG_WAIT_MAX_TRY 3 #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 = g_tfe_hw_mgr.ctx_pool[i].cdm_cmd =
kzalloc(((sizeof(struct cam_cdm_bl_request)) + 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); sizeof(struct cam_cdm_bl_cmd))), GFP_KERNEL);
if (!g_tfe_hw_mgr.ctx_pool[i].cdm_cmd) { if (!g_tfe_hw_mgr.ctx_pool[i].cdm_cmd) {
rc = -ENOMEM; rc = -ENOMEM;

6
drivers/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h
View File

@@ -38,6 +38,12 @@
#define CAM_IFE_CTX_CONSUME_ADDR_EN BIT(2) #define CAM_IFE_CTX_CONSUME_ADDR_EN BIT(2)
#define CAM_IFE_CTX_APPLY_DEFAULT_CFG BIT(3) #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 * enum cam_isp_hw_event_type - Collection of the ISP hardware events
*/ */