Merge "Revert "Merge commit 'ab61fb58' into msm-4.9 - PC232"" (9302fcda) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_cdm/cam_cdm.h

+3 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017, 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
		@@ -195,11 +195,11 @@ struct cam_cdm_hw_intf_cmd_submit_bl {
		struct cam_cdm_bl_request *data;
		};

		/* struct cam_cdm_hw_mem - CDM hw memory struct */
		/* struct cam_cdm_hw_mem - CDM hw memory.struct */
		struct cam_cdm_hw_mem {
		int32_t handle;
		uint32_t vaddr;
		uintptr_t kmdvaddr;
		uint64_t kmdvaddr;
		size_t size;
		};

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_intf_api.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ struct cam_cdm_bl_cmd {
		union {
		int32_t mem_handle;
		uint32_t *hw_iova;
		uintptr_t kernel_iova;
		void *kernel_iova;
		} bl_addr;
		uint32_t offset;
		uint32_t len;

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_virtual_core.c

+4 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017, 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
		@@ -87,7 +87,7 @@ int cam_virtual_cdm_submit_bl(struct cam_hw_info *cdm_hw,

		mutex_lock(&client->lock);
		for (i = 0; i < req->data->cmd_arrary_count ; i++) {
		uintptr_t vaddr_ptr = 0;
		uint64_t vaddr_ptr = 0;
		size_t len = 0;

		if ((!cdm_cmd->cmd[i].len) &&
		@@ -106,7 +106,8 @@ int cam_virtual_cdm_submit_bl(struct cam_hw_info *cdm_hw,
		} else if (req->data->type ==
		CAM_CDM_BL_CMD_TYPE_KERNEL_IOVA) {
		rc = 0;
		vaddr_ptr = cdm_cmd->cmd[i].bl_addr.kernel_iova;
		vaddr_ptr =
		(uint64_t)cdm_cmd->cmd[i].bl_addr.kernel_iova;
		len = cdm_cmd->cmd[i].offset + cdm_cmd->cmd[i].len;
		} else {
		CAM_ERR(CAM_CDM,

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

+0 −59

Original line number	Diff line number	Diff line
		@@ -285,36 +285,6 @@ int cam_context_handle_acquire_dev(struct cam_context *ctx,
		return rc;
		}

		int cam_context_handle_acquire_hw(struct cam_context *ctx,
		void *args)
		{
		int rc;

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

		if (!args) {
		CAM_ERR(CAM_CORE, "Invalid acquire device hw command payload");
		return -EINVAL;
		}

		mutex_lock(&ctx->ctx_mutex);
		if (ctx->state_machine[ctx->state].ioctl_ops.acquire_hw) {
		rc = ctx->state_machine[ctx->state].ioctl_ops.acquire_hw(
		ctx, args);
		} else {
		CAM_ERR(CAM_CORE, "No acquire hw for dev %s, state %d",
		ctx->dev_name, ctx->state);
		rc = -EPROTO;
		}

		mutex_unlock(&ctx->ctx_mutex);

		return rc;
		}

		int cam_context_handle_release_dev(struct cam_context *ctx,
		struct cam_release_dev_cmd *cmd)
		{
		@@ -344,35 +314,6 @@ int cam_context_handle_release_dev(struct cam_context *ctx,
		return rc;
		}

		int cam_context_handle_release_hw(struct cam_context *ctx,
		void *args)
		{
		int rc;

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

		if (!args) {
		CAM_ERR(CAM_CORE, "Invalid release HW command payload");
		return -EINVAL;
		}

		mutex_lock(&ctx->ctx_mutex);
		if (ctx->state_machine[ctx->state].ioctl_ops.release_hw) {
		rc = ctx->state_machine[ctx->state].ioctl_ops.release_hw(
		ctx, args);
		} else {
		CAM_ERR(CAM_CORE, "No release hw for dev %s, state %d",
		ctx->dev_name, ctx->state);
		rc = -EPROTO;
		}
		mutex_unlock(&ctx->ctx_mutex);

		return rc;
		}

		int cam_context_handle_flush_dev(struct cam_context *ctx,
		struct cam_flush_dev_cmd *cmd)
		{

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

+0 −28

Original line number	Diff line number	Diff line
		@@ -87,8 +87,6 @@ struct cam_ctx_request {
		* @start_dev: Function pointer for start device
		* @stop_dev: Function pointer for stop device
		* @flush_dev: Function pointer for flush device
		* @acquire_hw: Function pointer for acquire hw
		* @release_hw: Function pointer for release hw
		*
		*/
		struct cam_ctx_ioctl_ops {
		@@ -104,8 +102,6 @@ struct cam_ctx_ioctl_ops {
		struct cam_start_stop_dev_cmd *cmd);
		int (flush_dev)(struct cam_context ctx,
		struct cam_flush_dev_cmd *cmd);
		int (acquire_hw)(struct cam_context ctx, void *args);
		int (release_hw)(struct cam_context ctx, void *args);
		};

		/**
		@@ -324,18 +320,6 @@ int cam_context_dump_pf_info(struct cam_context *ctx, unsigned long iova,
		int cam_context_handle_acquire_dev(struct cam_context *ctx,
		struct cam_acquire_dev_cmd *cmd);

		/**
		* cam_context_handle_acquire_hw()
		*
		* @brief: Handle acquire HW command
		*
		* @ctx: Object pointer for cam_context
		* @cmd: Acquire HW command payload
		*
		*/
		int cam_context_handle_acquire_hw(struct cam_context *ctx,
		void *cmd);

		/**
		* cam_context_handle_release_dev()
		*
		@@ -348,18 +332,6 @@ int cam_context_handle_acquire_hw(struct cam_context *ctx,
		int cam_context_handle_release_dev(struct cam_context *ctx,
		struct cam_release_dev_cmd *cmd);

		/**
		* cam_context_handle_release_hw()
		*
		* @brief: Handle release HW command
		*
		* @ctx: Object pointer for cam_context
		* @cmd: Release HW command payload
		*
		*/
		int cam_context_handle_release_hw(struct cam_context *ctx,
		void *cmd);

		/**
		* cam_context_handle_config_dev()
		*