Merge "msm: camera: fd: add FD trace point" into dev/msm-4.9-camx (318115ac) · Commits · e / devices / android_kernel_fairphone_FP3

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -256,7 +256,7 @@ static int __cam_node_crm_apply_req(struct cam_req_mgr_apply_request *apply)
		return -EINVAL;
		}

		trace_cam_apply_req("Node", apply);
		trace_cam_apply_req("Node", apply->request_id);

		return cam_context_handle_crm_apply_req(ctx, apply);
		}

drivers/media/platform/msm/camera/cam_fd/cam_fd_context.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@

		#include "cam_debug_util.h"
		#include "cam_fd_context.h"
		#include "cam_trace.h"

		/* Functions in Available state */
		static int __cam_fd_ctx_acquire_dev_in_available(struct cam_context *ctx,
		@@ -29,6 +30,7 @@ static int __cam_fd_ctx_acquire_dev_in_available(struct cam_context *ctx,
		}

		ctx->state = CAM_CTX_ACQUIRED;
		trace_cam_context_state("FD", ctx);

		return rc;
		}
		@@ -46,6 +48,7 @@ static int __cam_fd_ctx_release_dev_in_acquired(struct cam_context *ctx,
		}

		ctx->state = CAM_CTX_AVAILABLE;
		trace_cam_context_state("FD", ctx);

		return rc;
		}
		@@ -76,6 +79,7 @@ static int __cam_fd_ctx_start_dev_in_acquired(struct cam_context *ctx,
		}

		ctx->state = CAM_CTX_ACTIVATED;
		trace_cam_context_state("FD", ctx);

		return rc;
		}
		@@ -93,6 +97,7 @@ static int __cam_fd_ctx_stop_dev_in_activated(struct cam_context *ctx,
		}

		ctx->state = CAM_CTX_ACQUIRED;
		trace_cam_context_state("FD", ctx);

		return rc;
		}

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include "cam_fd_hw_soc.h"
		#include "cam_fd_hw_mgr_intf.h"
		#include "cam_fd_hw_mgr.h"
		#include "cam_trace.h"

		static struct cam_fd_hw_mgr g_fd_hw_mgr;

		@@ -334,7 +335,7 @@ static int cam_fd_mgr_util_select_device(struct cam_fd_hw_mgr *hw_mgr,
		/* Update required info in hw context */
		hw_ctx->device_index = i;

		CAM_DBG(CAM_FD, "ctx index=%d, hw_ctx=%d", hw_ctx->ctx_index,
		CAM_DBG(CAM_FD, "ctx index=%d, device_index=%d", hw_ctx->ctx_index,
		hw_ctx->device_index);

		return 0;
		@@ -835,6 +836,8 @@ static int cam_fd_mgr_util_submit_frame(void priv, void data)
		return -EBUSY;
		}

		trace_cam_submit_to_hw("FD", frame_req->request_id);

		list_del_init(&frame_req->list);
		mutex_unlock(&hw_mgr->frame_req_mutex);

		@@ -995,6 +998,8 @@ static int32_t cam_fd_mgr_workq_irq_cb(void priv, void data)
		frame_abort = false;
		}

		trace_cam_irq_handled("FD", irq_type);

		notify_context:
		/* Do a callback to inform frame done or stop done */
		if (frame_req->hw_ctx->event_cb) {
		@@ -1229,7 +1234,7 @@ static int cam_fd_mgr_hw_start(void hw_mgr_priv, void mgr_start_args)
		return -EPERM;
		}

		CAM_DBG(CAM_FD, "ctx index=%d, hw_ctx=%d", hw_ctx->ctx_index,
		CAM_DBG(CAM_FD, "ctx index=%d, device_index=%d", hw_ctx->ctx_index,
		hw_ctx->device_index);

		rc = cam_fd_mgr_util_get_device(hw_mgr, hw_ctx, &hw_device);
		@@ -1460,6 +1465,8 @@ static int cam_fd_mgr_hw_config(void hw_mgr_priv, void hw_config_args)
		}

		frame_req = config->priv;

		trace_cam_apply_req("FD", frame_req->request_id);
		CAM_DBG(CAM_FD, "FrameHWConfig : Frame[%lld]", frame_req->request_id);

		frame_req->num_hw_update_entries = config->num_hw_update_entries;

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@

		#include "cam_fd_hw_core.h"
		#include "cam_fd_hw_soc.h"
		#include "cam_trace.h"

		#define CAM_FD_REG_VAL_PAIR_SIZE 256

		@@ -30,6 +31,7 @@ static uint32_t cam_fd_cdm_write_reg_val_pair(uint32_t *buffer,
		static void cam_fd_hw_util_cdm_callback(uint32_t handle, void *userdata,
		enum cam_cdm_cb_status status, uint32_t cookie)
		{
		trace_cam_cdm_cb("FD", status);
		CAM_DBG(CAM_FD, "CDM hdl=%x, udata=%pK, status=%d, cookie=%d",
		handle, userdata, status, cookie);
		}
		@@ -570,6 +572,8 @@ irqreturn_t cam_fd_hw_irq(int irq_num, void *data)
		return -EINVAL;
		}

		trace_cam_irq_activated("FD", irq_type);

		cam_fd_soc_register_write(soc_info, CAM_FD_REG_WRAPPER,
		hw_static_info->wrapper_regs.irq_clear,
		hw_static_info->irq_mask);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1875,7 +1875,7 @@ static int __cam_isp_ctx_apply_req(struct cam_context *ctx,
		struct cam_isp_context *ctx_isp =
		(struct cam_isp_context *) ctx->ctx_priv;

		trace_cam_apply_req("ISP", apply);
		trace_cam_apply_req("ISP", apply->request_id);
		CAM_DBG(CAM_ISP, "Enter: apply req in Substate %d request _id:%lld",
		ctx_isp->substate_activated, apply->request_id);
		if (ctx_isp->substate_machine[ctx_isp->substate_activated].