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

Commit c4a7cddc authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: increase number of hw entries" into camera-kernel.lnx.4.0

parents b37352f9 91eddafa

drivers/cam_isp/cam_isp_context.h

+0 −5
Original line number Diff line number Diff line
@@ -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

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+1 −3
Original line number Diff line number Diff line
@@ -26,8 +26,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
@@ -8340,7 +8338,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;

drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "cam_req_mgr_debug.h"

#include "cam_trace.h"



#define CAM_TFE_HW_ENTRIES_MAX  20

#define CAM_TFE_HW_CONFIG_TIMEOUT 60

#define CAM_TFE_HW_CONFIG_WAIT_MAX_TRY  3
@@ -5797,7 +5796,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;

drivers/cam_isp/isp_hw_mgr/include/cam_isp_hw_mgr_intf.h

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ 
/* Appliacble vote paths for dual ife, based on no. of UAPI definitions */

#define CAM_ISP_MAX_PER_PATH_VOTES 40



/*

 * 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

 */