Merge "UPSTREAM: Merge remote-tracking branch 'quic/dev/msm-4.9-camx' into msm-4.9 10/23" (71582f57) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/sdm845-camera.dtsi

+11 −2

Original line number	Diff line number	Diff line
		@@ -296,11 +296,20 @@
		status = "ok";
		};

		iova-mem-region-secondary-heap {
		/* Secondary heap region is 1MB long */
		iova-region-name = "secheap";
		iova-region-start = <0xd800000>;
		iova-region-len = <0x100000>;
		iova-region-id = <0x4>;
		status = "ok";
		};

		iova-mem-region-io {
		/* IO region is approximately 3.3 GB */
		iova-region-name = "io";
		iova-region-start = <0xd800000>;
		iova-region-len = <0xd2800000>;
		iova-region-start = <0xd900000>;
		iova-region-len = <0xd2700000>;
		iova-region-id = <0x3>;
		status = "ok";
		};

+11 −2

Original line number	Diff line number	Diff line
		@@ -210,11 +210,20 @@
		status = "ok";
		};

		iova-mem-region-secondary-heap {
		/* Secondary heap region is 1MB long */
		iova-region-name = "secheap";
		iova-region-start = <0xd800000>;
		iova-region-len = <0x100000>;
		iova-region-id = <0x4>;
		status = "ok";
		};

		iova-mem-region-io {
		/* IO region is approximately 3.3 GB */
		iova-region-name = "io";
		iova-region-start = <0xd800000>;
		iova-region-len = <0xd2800000>;
		iova-region-start = <0xd900000>;
		iova-region-len = <0xd2700000>;
		iova-region-id = <0x3>;
		status = "ok";
		};

+2 −0

Original line number	Diff line number	Diff line
		@@ -355,6 +355,8 @@ int cam_context_init(struct cam_context *ctx,

		memset(ctx, 0, sizeof(*ctx));
		ctx->dev_hdl = -1;
		ctx->link_hdl = -1;
		ctx->session_hdl = -1;
		INIT_LIST_HEAD(&ctx->list);
		mutex_init(&ctx->ctx_mutex);
		spin_lock_init(&ctx->lock);

+7 −2

Original line number	Diff line number	Diff line
		@@ -61,9 +61,9 @@ int hfi_write_cmd(void *cmd_ptr);
		* @pmsg: buffer to place read message for hfi queue
		* @q_id: queue id
		*
		* Returns success(zero)/failure(non zero)
		* Returns size read in words/failure(negative value)
		*/
		int hfi_read_message(uint32_t *pmsg, uint8_t q_id);
		int64_t hfi_read_message(uint32_t *pmsg, uint8_t q_id);

		/**
		* hfi_init() - function initialize hfi after firmware download
		@@ -109,6 +109,11 @@ void cam_hfi_disable_cpu(void __iomem *icp_base);
		* cam_hfi_deinit() - cleanup HFI
		*/
		void cam_hfi_deinit(void);
		/**
		* hfi_set_debug_level() - set debug level
		* @lvl: FW debug message level
		*/
		int hfi_set_debug_level(uint32_t lvl);

		/**
		* hfi_enable_ipe_bps_pc() - Enable interframe pc

+4 −3

Original line number	Diff line number	Diff line
		@@ -60,11 +60,11 @@

		#define ICP_CMD_Q_SIZE_IN_BYTES 4096
		#define ICP_MSG_Q_SIZE_IN_BYTES 4096
		#define ICP_DBG_Q_SIZE_IN_BYTES 8192
		#define ICP_DBG_Q_SIZE_IN_BYTES 102400

		#define ICP_SHARED_MEM_IN_BYTES (1024 * 1024)
		#define ICP_UNCACHED_HEAP_SIZE_IN_BYTES (2 * 1024 * 1024)
		#define ICP_HFI_MAX_MSG_SIZE_IN_WORDS 128
		#define ICP_HFI_MAX_PKT_SIZE_IN_WORDS 25600

		#define ICP_HFI_QTBL_HOSTID1 0x01000000
		#define ICP_HFI_QTBL_STATUS_ENABLED 0x00000001
		@@ -109,7 +109,8 @@ enum hfi_state {
		*/
		enum reg_settings {
		RESET,
		SET
		SET,
		SET_WM = 1024
		};

		/**