Merge "msm: camera: isp: Max requests per context reduction in isp driver" into camera-kernel.lnx.4.0

This commit is contained in:
Camera Software Integration 2020-09-22 14:32:20 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0219f6206e
2 changed files with 6 additions and 4 deletions

View file

@ -5678,14 +5678,14 @@ int cam_isp_context_init(struct cam_isp_context *ctx,
ctx->init_timestamp = jiffies_to_msecs(jiffies);
ctx->isp_device_type = isp_device_type;
for (i = 0; i < CAM_CTX_REQ_MAX; i++) {
for (i = 0; i < CAM_ISP_CTX_REQ_MAX; i++) {
ctx->req_base[i].req_priv = &ctx->req_isp[i];
ctx->req_isp[i].base = &ctx->req_base[i];
}
/* camera context setup */
rc = cam_context_init(ctx_base, isp_dev_name, CAM_ISP, ctx_id,
crm_node_intf, hw_intf, ctx->req_base, CAM_CTX_REQ_MAX);
crm_node_intf, hw_intf, ctx->req_base, CAM_ISP_CTX_REQ_MAX);
if (rc) {
CAM_ERR(CAM_ISP, "Camera Context Base init failed");
goto err;

View file

@ -26,6 +26,8 @@
*/
#define CAM_ISP_CTX_RES_MAX 24
/* 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.
@ -270,8 +272,8 @@ struct cam_isp_context {
struct cam_ctx_ops *substate_machine;
struct cam_isp_ctx_irq_ops *substate_machine_irq;
struct cam_ctx_request req_base[CAM_CTX_REQ_MAX];
struct cam_isp_ctx_req req_isp[CAM_CTX_REQ_MAX];
struct cam_ctx_request req_base[CAM_ISP_CTX_REQ_MAX];
struct cam_isp_ctx_req req_isp[CAM_ISP_CTX_REQ_MAX];
void *hw_ctx;
uint64_t sof_timestamp_val;