Merge "Merge remote-tracking branch 'dev/msm-4.14' into msm-4.9 08/23" (0fbb6a6a) · Commits · e / devices / android_kernel_fairphone_FP3

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

+49 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,28 @@ int cam_context_handle_crm_process_evt(struct cam_context *ctx,
		return rc;
		}

		int cam_context_handle_crm_dump_req(struct cam_context *ctx,
		struct cam_req_mgr_dump_info *dump)
		{
		int rc = 0;

		if (!ctx->state_machine) {
		CAM_ERR(CAM_CORE, "Context is not ready");
		return -EINVAL;
		}
		mutex_lock(&ctx->ctx_mutex);
		if (ctx->state_machine[ctx->state].crm_ops.dump_req) {
		rc = ctx->state_machine[ctx->state].crm_ops.dump_req(ctx,
		dump);
		} else {
		CAM_ERR(CAM_CORE, "No crm dump req in dev %d, state %d",
		ctx->dev_hdl, ctx->state);
		}
		mutex_unlock(&ctx->ctx_mutex);

		return rc;
		}

		int cam_context_dump_pf_info(struct cam_context *ctx, unsigned long iova,
		uint32_t buf_info)
		{
		@@ -501,6 +523,33 @@ int cam_context_handle_stop_dev(struct cam_context *ctx,
		return rc;
		}

		int cam_context_handle_dump_dev(struct cam_context *ctx,
		struct cam_dump_req_cmd *cmd)
		{
		int rc = 0;

		if (!ctx \|\| !ctx->state_machine) {
		CAM_ERR(CAM_CORE, "Context is not ready");
		return -EINVAL;
		}

		if (!cmd) {
		CAM_ERR(CAM_CORE, "Invalid stop device command payload");
		return -EINVAL;
		}

		mutex_lock(&ctx->ctx_mutex);
		if (ctx->state_machine[ctx->state].ioctl_ops.dump_dev)
		rc = ctx->state_machine[ctx->state].ioctl_ops.dump_dev(
		ctx, cmd);
		else
		CAM_WARN(CAM_CORE, "No dump device in dev %d, name %s state %d",
		ctx->dev_hdl, ctx->dev_name, ctx->state);
		mutex_unlock(&ctx->ctx_mutex);

		return rc;
		}

		int cam_context_init(struct cam_context *ctx,
		const char *dev_name,
		uint64_t dev_id,

drivers/media/platform/msm/camera_v3/cam_core/cam_context.h

+32 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ struct cam_ctx_request {
		* @flush_dev: Function pointer for flush device
		* @acquire_hw: Function pointer for acquire hw
		* @release_hw: Function pointer for release hw
		* @dump_dev: Function pointer for dump dev
		*
		*/
		struct cam_ctx_ioctl_ops {
		@@ -109,6 +110,9 @@ struct cam_ctx_ioctl_ops {
		struct cam_flush_dev_cmd *cmd);
		int (acquire_hw)(struct cam_context ctx, void *args);
		int (release_hw)(struct cam_context ctx, void *args);
		int (dump_dev)(struct cam_context ctx,
		struct cam_dump_req_cmd *cmd);

		};

		/**
		@@ -120,6 +124,7 @@ struct cam_ctx_ioctl_ops {
		* @apply_req: Apply setting for the context
		* @flush_req: Flush request to remove request ids
		* @process_evt: Handle event notification from CRM.(optional)
		* @dump_req: Dump information for the issue request
		*
		*/
		struct cam_ctx_crm_ops {
		@@ -135,6 +140,8 @@ struct cam_ctx_crm_ops {
		struct cam_req_mgr_flush_request *flush);
		int (process_evt)(struct cam_context ctx,
		struct cam_req_mgr_link_evt_data *evt_data);
		int (dump_req)(struct cam_context ctx,
		struct cam_req_mgr_dump_info *dump);
		};


		@@ -304,6 +311,18 @@ int cam_context_handle_crm_flush_req(struct cam_context *ctx,
		int cam_context_handle_crm_process_evt(struct cam_context *ctx,
		struct cam_req_mgr_link_evt_data *process_evt);

		/**
		* cam_context_handle_crm_dump_req()
		*
		* @brief: Handle CRM dump request
		*
		* @ctx: Object pointer for cam_context
		* @dump: Request to dump
		*
		*/
		int cam_context_handle_crm_dump_req(struct cam_context *ctx,
		struct cam_req_mgr_dump_info *dump);

		/**
		* cam_context_dump_pf_info()
		*
		@@ -413,6 +432,19 @@ int cam_context_handle_start_dev(struct cam_context *ctx,
		int cam_context_handle_stop_dev(struct cam_context *ctx,
		struct cam_start_stop_dev_cmd *cmd);


		/**
		* cam_context_handle_dump_dev()
		*
		* @brief: Handle dump device command
		*
		* @ctx: Object pointer for cam_context
		* @cmd: Dump device command payload
		*
		*/
		int cam_context_handle_dump_dev(struct cam_context *ctx,
		struct cam_dump_req_cmd *cmd);

		/**
		* cam_context_deinit()
		*

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

+40 −0

Original line number	Diff line number	Diff line
		@@ -1039,3 +1039,43 @@ int32_t cam_context_dump_pf_info_to_hw(struct cam_context *ctx,
		end:
		return rc;
		}

		int32_t cam_context_dump_dev_to_hw(struct cam_context *ctx,
		struct cam_dump_req_cmd *cmd)
		{
		int rc = 0;
		struct cam_hw_dump_args dump_args;

		if (!ctx \|\| !cmd) {
		CAM_ERR(CAM_CTXT, "Invalid input params %pK %pK", ctx, cmd);
		return -EINVAL;
		}
		if (!ctx->hw_mgr_intf) {
		CAM_ERR(CAM_CTXT, "[%s][%d] HW interface is not ready",
		ctx->dev_name, ctx->ctx_id);
		return -EFAULT;
		}
		memset(&dump_args, 0, sizeof(dump_args));
		if (ctx->hw_mgr_intf->hw_dump) {
		dump_args.ctxt_to_hw_map = ctx->ctxt_to_hw_map;
		dump_args.buf_handle = cmd->buf_handle;
		dump_args.offset = cmd->offset;
		dump_args.request_id = cmd->issue_req_id;
		rc = ctx->hw_mgr_intf->hw_dump(
		ctx->hw_mgr_intf->hw_mgr_priv,
		&dump_args);
		if (rc) {
		CAM_ERR(CAM_CTXT, "[%s][%d] handle[%u] failed",
		ctx->dev_name, ctx->ctx_id, dump_args.buf_handle);
		return rc;
		}
		CAM_INFO(CAM_CTXT, "[%s] ctx: %d Filled Length %d",
		ctx->dev_name, ctx->ctx_id,
		dump_args.offset - cmd->offset);
		/* Drivers update offest upto which the buffer is written*/
		cmd->offset = dump_args.offset;
		} else {
		CAM_INFO(CAM_CTXT, "%s hw dump not registered", ctx->dev_name);
		}
		return rc;
		}

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

+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
		@@ -36,5 +36,6 @@ int32_t cam_context_flush_req_to_hw(struct cam_context *ctx,
		int32_t cam_context_dump_pf_info_to_hw(struct cam_context *ctx,
		struct cam_packet *packet, unsigned long iova, uint32_t buf_info,
		bool *mem_found);

		int32_t cam_context_dump_dev_to_hw(struct cam_context *ctx,
		struct cam_dump_req_cmd *cmd);
		#endif /* _CAM_CONTEXT_UTILS_H_ */

drivers/media/platform/msm/camera_v3/cam_core/cam_hw_mgr_intf.h

+17 −0

Original line number	Diff line number	Diff line
		@@ -272,6 +272,21 @@ struct cam_hw_reset_args {
		void *ctxt_to_hw_map;
		};

		/**
		* struct cam_hw_dump_args - Dump arguments
		*
		* @request_id: request_id
		* @buf_handle: Buffer handle
		* @offset: Buffer offset. This is updated by the drivers.
		* @ctxt_to_hw_map: HW context from the acquire
		*/
		struct cam_hw_dump_args {
		uint64_t request_id;
		uint32_t buf_handle;
		int32_t offset;
		void *ctxt_to_hw_map;
		};

		/* enum cam_hw_mgr_command - Hardware manager command type */
		enum cam_hw_mgr_command {
		CAM_HW_MGR_CMD_INTERNAL,
		@@ -324,6 +339,7 @@ struct cam_hw_cmd_args {
		* @hw_close: Function pointer for HW deinit
		* @hw_flush: Function pointer for HW flush
		* @hw_reset: Function pointer for HW reset
		* @hw_dump: Function pointer for HW dump
		*
		*/
		struct cam_hw_mgr_intf {
		@@ -345,6 +361,7 @@ struct cam_hw_mgr_intf {
		int (hw_close)(void hw_priv, void *hw_close_args);
		int (hw_flush)(void hw_priv, void *hw_flush_args);
		int (hw_reset)(void hw_priv, void *hw_reset_args);
		int (hw_dump)(void hw_priv, void *hw_dump_args);
		};

		#endif /* _CAM_HW_MGR_INTF_H_ */