Merge "Merge remote-tracking branch 'dev/msm-4.14' into msm-4.9 06/12" (536e718e) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera_v3/cam_core/cam_context_utils.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -574,7 +574,7 @@ int32_t cam_context_acquire_dev_to_hw(struct cam_context *ctx,
		req_hdl_param.media_entity_flag = 0;
		req_hdl_param.priv = ctx;
		req_hdl_param.ops = ctx->crm_ctx_intf;

		req_hdl_param.dev_id = ctx->dev_id;
		ctx->dev_hdl = cam_create_device_hdl(&req_hdl_param);
		if (ctx->dev_hdl <= 0) {
		rc = -EFAULT;

+3 −3

Original line number	Diff line number	Diff line
		@@ -568,7 +568,7 @@ static int cam_cpas_util_set_camnoc_axi_clk_rate(
		struct cam_cpas_axi_port *curr_axi_port = NULL;
		struct cam_cpas_axi_port *temp_axi_port = NULL;
		uint64_t required_camnoc_bw = 0;
		int32_t clk_rate = 0;
		int64_t clk_rate = 0;

		list_for_each_entry_safe(curr_axi_port, temp_axi_port,
		&cpas_core->axi_ports_list_head, sibling_port) {
		@@ -596,13 +596,13 @@ static int cam_cpas_util_set_camnoc_axi_clk_rate(

		clk_rate = required_camnoc_bw / soc_private->camnoc_bus_width;

		CAM_DBG(CAM_CPAS, "Setting camnoc axi clk rate : %llu %d",
		CAM_DBG(CAM_CPAS, "Setting camnoc axi clk rate : %llu %lld",
		required_camnoc_bw, clk_rate);

		rc = cam_soc_util_set_src_clk_rate(soc_info, clk_rate);
		if (rc)
		CAM_ERR(CAM_CPAS,
		"Failed in setting camnoc axi clk %llu %d %d",
		"Failed in setting camnoc axi clk %llu %lld %d",
		required_camnoc_bw, clk_rate, rc);
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -415,6 +415,12 @@ static void cam_cpastop_work(struct work_struct *work)
		return;
		}

		mutex_lock(&cpas_hw->hw_mutex);
		if (cpas_hw->hw_state == CAM_HW_STATE_POWER_DOWN) {
		CAM_ERR(CAM_CPAS, "CPAS CORE is off");
		mutex_unlock(&cpas_hw->hw_mutex);
		return;
		}
		for (i = 0; i < camnoc_info->irq_err_size; i++) {
		if ((payload->irq_status & camnoc_info->irq_err[i].sbm_port) &&
		(camnoc_info->irq_err[i].enable)) {
		@@ -460,6 +466,7 @@ static void cam_cpastop_work(struct work_struct *work)
		~camnoc_info->irq_err[i].sbm_port;
		}
		}
		mutex_unlock(&cpas_hw->hw_mutex);
		atomic_dec(&cpas_core->irq_count);
		wake_up(&cpas_core->irq_count_wq);
		CAM_DBG(CAM_CPAS, "irq_count=%d\n", atomic_read(&cpas_core->irq_count));

+0 −4

Original line number	Diff line number	Diff line
		@@ -206,10 +206,6 @@ static const struct of_device_id cam_fd_hw_dt_match[] = {
		.compatible = "qcom,fd501",
		.data = &cam_fd_wrapper200_core501_info,
		},
		{
		.compatible = "qcom,fd501",
		.data = &cam_fd_wrapper200_core501_info,
		},
		{}
		};
		MODULE_DEVICE_TABLE(of, cam_fd_hw_dt_match);

+22 −1

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
		@@ -215,6 +215,27 @@

		#define HFI_DEV_VERSION_MAX 0x5

		/* General errors and HFI Specific errors. */
		enum hfi_errors {
		CAMERAICP_SUCCESS,
		CAMERAICP_EFAILED,
		CAMERAICP_ENOMEMORY,
		CAMERAICP_EBADSTATE,
		CAMERAICP_EBADPARM,
		CAMERAICP_EBADITEM,
		CAMERAICP_EINVALIDFORMAT,
		CAMERAICP_EUNSUPPORTED,
		CAMERAICP_EOUTOFBOUND,
		CAMERAICP_ETIMEDOUT,
		CAMERAICP_EABORTED,
		CAMERAICP_EHWVIOLATION,
		CAMERAICP_ECDMERROR,
		CAMERAICP_HFI_ERR_COMMAND_SIZE = 1000,
		CAMERAICP_HFI_ERR_MESSAGE_SIZE,
		CAMERAICP_HFI_QUEUE_EMPTY,
		CAMERAICP_HFI_QUEUE_FULL,
		};

		/**
		* start of sys command packet types
		* These commands are used to get system level information