Merge "Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14 03/12" (5e121050) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -3170,7 +3170,7 @@ static int __cam_isp_ctx_start_dev_in_ready(struct cam_context *ctx,
		ctx_isp->reported_req_id = 0;
		ctx_isp->substate_activated = ctx_isp->rdi_only_context ?
		CAM_ISP_CTX_ACTIVATED_APPLIED :
		(req_isp->num_fence_map_out) ? CAM_ISP_CTX_ACTIVATED_EPOCH :
		(req_isp->num_fence_map_out) ? CAM_ISP_CTX_ACTIVATED_APPLIED :
		CAM_ISP_CTX_ACTIVATED_SOF;

		/*
		@@ -3192,13 +3192,8 @@ static int __cam_isp_ctx_start_dev_in_ready(struct cam_context *ctx,
		CAM_DBG(CAM_ISP, "start device success ctx %u", ctx->ctx_id);

		list_del_init(&req->list);

		if (req_isp->num_fence_map_out) {
		list_add_tail(&req->list, &ctx->active_req_list);
		ctx_isp->active_req_cnt++;
		} else {
		list_add_tail(&req->list, &ctx->wait_req_list);
		}

		end:
		return rc;
		}

drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c

+2 −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
		@@ -912,7 +912,7 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t e_ctrl, void arg)
		vfree(e_ctrl->cal_data.map);
		e_ctrl->cal_data.num_data = 0;
		e_ctrl->cal_data.num_map = 0;
		e_ctrl->cam_eeprom_state = CAM_EEPROM_INIT;
		e_ctrl->cam_eeprom_state = CAM_EEPROM_ACQUIRE;
		release_buf:
		if (cam_mem_put_cpu_buf(dev_config.packet_handle))
		CAM_WARN(CAM_EEPROM, "Put cpu buffer failed : 0x%x",

drivers/media/platform/msm/camera/cam_sync/cam_sync.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -322,7 +322,7 @@ int cam_sync_get_obj_ref(int32_t sync_obj)

		if (row->state != CAM_SYNC_STATE_ACTIVE) {
		spin_unlock(&sync_dev->row_spinlocks[sync_obj]);
		CAM_ERR(CAM_SYNC,
		CAM_ERR_RATE_LIMIT_CUSTOM(CAM_SYNC, 1, 5,
		"accessing an uninitialized sync obj = %d state = %d",
		sync_obj, row->state);
		return -EINVAL;

drivers/media/platform/msm/camera/cam_utils/cam_debug_util.h

+43 −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
		@@ -120,6 +120,27 @@ const char *cam_get_module_name(unsigned int module_id);
		pr_err_ratelimited("CAM_INFO: %s: %s: %d " fmt "\n", \
		cam_get_module_name(__module), __func__, __LINE__, ##args)

		/*
		* CAM_INFO_RATE_LIMIT_CUSTOM
		* @brief : This Macro will print info logs with custom ratelimit
		*
		* @__module : Respective module id which is been calling this Macro
		* @interval : Time interval in seconds
		* @burst : No of logs to print in interval time
		* @fmt : Formatted string which needs to be print in log
		* @args : Arguments which needs to be print in log
		*/
		#define CAM_INFO_RATE_LIMIT_CUSTOM(__module, interval, burst, fmt, args...) \
		({ \
		static DEFINE_RATELIMIT_STATE(_rs, \
		(interval * HZ), \
		burst); \
		if (__ratelimit(&_rs)) \
		pr_info("CAM_INFO: %s: %s: %d " fmt "\n", \
		cam_get_module_name(__module), __func__,\
		__LINE__, ##args); \
		})

		/*
		* CAM_DBG
		* @brief : This Macro will print debug logs when enabled using GROUP
		@@ -139,4 +160,25 @@ const char *cam_get_module_name(unsigned int module_id);
		pr_err_ratelimited("CAM_ERR: %s: %s: %d " fmt "\n", \
		cam_get_module_name(__module), __func__, __LINE__, ##args)

		/*
		* CAM_ERR_RATE_LIMIT_CUSTOM
		* @brief : This Macro will print error logs with custom ratelimit
		*
		* @__module : Respective module id which is been calling this Macro
		* @interval : Time interval in seconds
		* @burst : No of logs to print in interval time
		* @fmt : Formatted string which needs to be print in log
		* @args : Arguments which needs to be print in log
		*/
		#define CAM_ERR_RATE_LIMIT_CUSTOM(__module, interval, burst, fmt, args...) \
		({ \
		static DEFINE_RATELIMIT_STATE(_rs, \
		(interval * HZ), \
		burst); \
		if (__ratelimit(&_rs)) \
		pr_err("CAM_ERR: %s: %s: %d " fmt "\n", \
		cam_get_module_name(__module), __func__,\
		__LINE__, ##args); \
		})

		#endif /* _CAM_DEBUG_UTIL_H_ */

drivers/media/platform/msm/camera/cam_utils/cam_packet_util.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ int cam_packet_util_get_kmd_buffer(struct cam_packet *packet,
		}

		if ((packet->kmd_cmd_buf_index < 0) \|\|
		(packet->kmd_cmd_buf_index > packet->num_cmd_buf)) {
		(packet->kmd_cmd_buf_index >= packet->num_cmd_buf)) {
		CAM_ERR(CAM_UTIL, "Invalid kmd buf index: %d",
		packet->kmd_cmd_buf_index);
		return -EINVAL;