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

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

Merge "msm: camera: icp: Increase request queue depth for ICP contexts" into camera-kernel.lnx.4.0

parents e3c7dd36 8d1b53b0

drivers/cam_core/cam_context.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ struct cam_context; 


/* max request number */

#define CAM_CTX_REQ_MAX              20

#define CAM_CTX_ICP_REQ_MAX          36

#define CAM_CTX_CFG_MAX              20

#define CAM_CTX_RES_MAX              20

drivers/cam_icp/cam_icp_context.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ int cam_icp_context_init(struct cam_icp_context *ctx, 
	}



	rc = cam_context_init(ctx->base, icp_dev_name, CAM_ICP, ctx_id,

		NULL, hw_intf, ctx->req_base, CAM_CTX_REQ_MAX);

		NULL, hw_intf, ctx->req_base, CAM_CTX_ICP_REQ_MAX);

	if (rc) {

		CAM_ERR(CAM_ICP, "Camera Context Base init failed");

		goto err;

drivers/cam_icp/cam_icp_context.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 */



#ifndef _CAM_ICP_CONTEXT_H_
@@ -19,7 +19,7 @@ 
struct cam_icp_context {

	struct cam_context *base;

	struct cam_ctx_ops *state_machine;

	struct cam_ctx_request req_base[CAM_CTX_REQ_MAX];

	struct cam_ctx_request req_base[CAM_CTX_ICP_REQ_MAX];

	uint32_t state;

	void *ctxt_to_hw_map;

};