Merge "Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14.c4 12/19" (bab8c44f) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/media/platform/msm/camera/cam_icp/cam_icp_context.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -277,7 +277,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_ICP_CTX_REQ_MAX);
		if (rc) {
		CAM_ERR(CAM_ICP, "Camera Context Base init failed");
		goto err;

+3 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -14,6 +14,7 @@
		#define _CAM_ICP_CONTEXT_H_

		#include "cam_context.h"
		#include "cam_icp_hw_mgr_intf.h"

		/**
		* struct cam_icp_context - icp context
		@@ -26,7 +27,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_ICP_CTX_REQ_MAX];
		uint32_t state;
		void *ctxt_to_hw_map;
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@
		#define CAM_ICP_ROLE_PARENT 1
		#define CAM_ICP_ROLE_CHILD 2

		#define CAM_FRAME_CMD_MAX 20
		#define CAM_FRAME_CMD_MAX CAM_ICP_CTX_REQ_MAX

		#define CAM_MAX_OUT_RES 6
		#define CAM_MAX_IN_RES 8

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@

		#define CAM_ICP_CTX_MAX 54

		#define CAM_ICP_CTX_REQ_MAX 40

		#define CPAS_IPE1_BIT 0x2000

		#define CAM_ICP_DUMP_TAG_MAX_LEN 32