Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a837f2e authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cam: debug: add tracepoints" into dev/msm-4.9-camx

parents cdd957e9 5164f3ac

drivers/media/platform/msm/camera/cam_core/Makefile

+2 −1
Original line number Diff line number Diff line 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_req_mgr

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sync

ccflags-y += -Idrivers/media/platform/msm/camera/cam_smmu/

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sync

ccflags-y += -Idrivers/media/platform/msm/camera/cam_utils



obj-$(CONFIG_SPECTRA_CAMERA) += cam_context.o cam_context_utils.o cam_node.o cam_subdev.o

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

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#ifndef _CAM_CONTEXT_H_

#define _CAM_CONTEXT_H_



#include <linux/mutex.h>

#include <linux/spinlock.h>

#include "cam_req_mgr_interface.h"

#include "cam_hw_mgr_intf.h"

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

+6 −3
Original line number Diff line number Diff line
@@ -19,11 +19,12 @@ 
#include <media/cam_sync.h>

#include <media/cam_defs.h>



#include "cam_sync_api.h"

#include "cam_req_mgr_util.h"

#include "cam_context.h"

#include "cam_mem_mgr.h"

#include "cam_node.h"

#include "cam_context.h"

#include "cam_req_mgr_util.h"

#include "cam_sync_api.h"

#include "cam_trace.h"



int cam_context_buf_done_from_hw(struct cam_context *ctx,

	void *done_event_data, uint32_t bubble_state)
@@ -42,6 +43,8 @@ int cam_context_buf_done_from_hw(struct cam_context *ctx, 
	req = list_first_entry(&ctx->active_req_list,

		struct cam_ctx_request, list);



	trace_cam_buf_done("UTILS", ctx, req);



	if (done->request_id != req->request_id) {

		pr_err("mismatch: done request [%lld], active request [%lld]\n",

			done->request_id, req->request_id);

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

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/uaccess.h>



#include "cam_node.h"

#include "cam_trace.h"



static void  __cam_node_handle_shutdown(struct cam_node *node)

{
@@ -255,6 +256,8 @@ static int __cam_node_crm_apply_req(struct cam_req_mgr_apply_request *apply) 
		return -EINVAL;

	}



	trace_cam_apply_req("Node", apply);



	return cam_context_handle_crm_apply_req(ctx, apply);

}

drivers/media/platform/msm/camera/cam_icp/cam_icp_context.c

+9 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "cam_icp_context.h"

#include "cam_req_mgr_util.h"

#include "cam_mem_mgr.h"

#include "cam_trace.h"



static int __cam_icp_acquire_dev_in_available(struct cam_context *ctx,

	struct cam_acquire_dev_cmd *cmd)
@@ -32,8 +33,10 @@ static int __cam_icp_acquire_dev_in_available(struct cam_context *ctx, 
	int rc;



	rc = cam_context_acquire_dev_to_hw(ctx, cmd);

	if (!rc)

	if (!rc) {

		ctx->state = CAM_CTX_ACQUIRED;

		trace_cam_context_state("ICP", ctx);

	}



	return rc;

}
@@ -48,6 +51,7 @@ static int __cam_icp_release_dev_in_acquired(struct cam_context *ctx, 
		pr_err("Unable to release device\n");



	ctx->state = CAM_CTX_AVAILABLE;

	trace_cam_context_state("ICP", ctx);

	return rc;

}
@@ -57,8 +61,10 @@ static int __cam_icp_start_dev_in_acquired(struct cam_context *ctx, 
	int rc;



	rc = cam_context_start_dev_to_hw(ctx, cmd);

	if (!rc)

	if (!rc) {

		ctx->state = CAM_CTX_READY;

		trace_cam_context_state("ICP", ctx);

	}



	return rc;

}
@@ -85,6 +91,7 @@ static int __cam_icp_stop_dev_in_ready(struct cam_context *ctx, 
		pr_err("Unable to stop device\n");



	ctx->state = CAM_CTX_ACQUIRED;

	trace_cam_context_state("ICP", ctx);

	return rc;

}