Merge "msm: camera: isp: Max requests per context reduction in isp driver"... (a4c69c8d) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/cam_isp/cam_isp_context.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4986,14 +4986,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;

+4 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,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.
		@@ -261,8 +263,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;