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

Commit 74e7370b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Add dynamic logging feature in camera"

parents a06bf3e1 1dd90d71

drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c

+3 −7
Original line number Diff line number Diff line
@@ -34,13 +34,9 @@ 
#include "msm.h"

#include "msm_buf_mgr.h"



/*#define CONFIG_MSM_ISP_DBG*/

#undef CDBG

#ifdef CONFIG_MSM_ISP_DBG

#define CDBG(fmt, args...) pr_err(fmt, ##args)

#else

#define CDBG(fmt, args...) do { } while (0)

#endif

#define CDBG(fmt, args...) pr_debug(fmt, ##args)



static struct msm_isp_bufq *msm_isp_get_bufq(

	struct msm_isp_buf_mgr *buf_mgr,

	uint32_t bufq_handle)
@@ -172,7 +168,7 @@ static int msm_isp_prepare_isp_buf(struct msm_isp_buf_mgr *buf_mgr, 
		}

		mapped_info->paddr += qbuf_buf->planes[i].offset;

		CDBG("%s: plane: %d addr:%lu\n",

			__func__, i, mapped_info->paddr);

			__func__, i, (unsigned long)mapped_info->paddr);



		buf_pending = kzalloc(sizeof(struct buffer_cmd), GFP_ATOMIC);

		if (!buf_pending) {

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+1 −6
Original line number Diff line number Diff line
@@ -22,13 +22,8 @@ 
#include "msm.h"

#include "msm_camera_io_util.h"



/*#define CONFIG_MSM_ISP_DBG*/

#undef CDBG

#ifdef CONFIG_MSM_ISP_DBG

#define CDBG(fmt, args...) pr_err(fmt, ##args)

#else

#define CDBG(fmt, args...) do { } while (0)

#endif

#define CDBG(fmt, args...) pr_debug(fmt, ##args)



#define VFE40_BURST_LEN 1

#define VFE40_BURST_LEN_8916_VERSION 2

drivers/media/platform/msm/camera_v2/isp/msm_isp44.c

+1 −6
Original line number Diff line number Diff line
@@ -22,13 +22,8 @@ 
#include "msm.h"

#include "msm_camera_io_util.h"



/*#define CONFIG_MSM_ISP_DBG*/

#undef CDBG

#ifdef CONFIG_MSM_ISP_DBG

#define CDBG(fmt, args...) pr_err(fmt, ##args)

#else

#define CDBG(fmt, args...) do { } while (0)

#endif

#define CDBG(fmt, args...) pr_debug(fmt, ##args)



#define STATS_IDX_BF_SCALE  0

#define STATS_IDX_BE        1

drivers/media/platform/msm/camera_v2/isp/msm_isp46.c

+1 −5
Original line number Diff line number Diff line
@@ -23,11 +23,7 @@ 
#include "msm_camera_io_util.h"



#undef CDBG

#ifdef CONFIG_MSM_ISP_DBG

#define CDBG(fmt, args...) pr_err(fmt, ##args)

#else

#define CDBG(fmt, args...) do { } while (0)

#endif

#define CDBG(fmt, args...) pr_debug(fmt, ##args)



#define STATS_IDX_BF_SCALE  0

#define STATS_IDX_HDR_BE    1

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+2 −2
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ int msm_isp_request_axi_stream(struct vfe_device *vfe_dev, void *arg) 
			stream_info->stream_src == IDEAL_RAW) {

			if (stream_info->stream_src == CAMIF_RAW &&

				io_format != stream_info->output_format)

				pr_warn("%s: Overriding input format\n",

				pr_debug("%s: Overriding input format\n",

					__func__);



			io_format = stream_info->output_format;
@@ -819,7 +819,7 @@ static void msm_isp_get_done_buf(struct vfe_device *vfe_dev, 
	for (i = 0; i < stream_info->num_planes; i++) {

		if (pingpong_bit !=

			(~(pingpong_status >> stream_info->wm[i]) & 0x1)) {

			pr_warn("%s: Write master ping pong mismatch. Status: 0x%x\n",

			pr_debug("%s: Write master ping pong mismatch. Status: 0x%x\n",

				__func__, pingpong_status);

		}

	}