From b55ca2cdb00cc611c697c27b024595d3efee9776 Mon Sep 17 00:00:00 2001 From: Dima Zavin Date: Fri, 12 Nov 2010 16:20:56 -0800 Subject: [PATCH] media: video: tegra: avp: make avp_svc have separate debug mask Change-Id: Ib5490a7f7d294760d34a3b9da14281ad96c9b26c Signed-off-by: Dima Zavin --- drivers/media/video/tegra/avp/avp.c | 19 ++++++++++++++++--- drivers/media/video/tegra/avp/avp.h | 15 --------------- drivers/media/video/tegra/avp/avp_svc.c | 10 ++++++++++ 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/drivers/media/video/tegra/avp/avp.c b/drivers/media/video/tegra/avp/avp.c index d5c3385b6fe6..6affcd341b05 100644 --- a/drivers/media/video/tegra/avp/avp.c +++ b/drivers/media/video/tegra/avp/avp.c @@ -49,11 +49,24 @@ #include "trpc.h" #include "avp.h" -u32 avp_debug_mask = (AVP_DBG_TRACE_TRPC_CONN | - AVP_DBG_TRACE_XPC_CONN | - AVP_DBG_TRACE_LIB); +enum { + AVP_DBG_TRACE_XPC = 1U << 0, + AVP_DBG_TRACE_XPC_IRQ = 1U << 1, + AVP_DBG_TRACE_XPC_MSG = 1U << 2, + AVP_DBG_TRACE_XPC_CONN = 1U << 3, + AVP_DBG_TRACE_TRPC_MSG = 1U << 4, + AVP_DBG_TRACE_TRPC_CONN = 1U << 5, + AVP_DBG_TRACE_LIB = 1U << 6, +}; + +static u32 avp_debug_mask = (AVP_DBG_TRACE_TRPC_CONN | + AVP_DBG_TRACE_XPC_CONN | + AVP_DBG_TRACE_LIB); module_param_named(debug_mask, avp_debug_mask, uint, S_IWUSR | S_IRUGO); +#define DBG(flag, args...) \ + do { if (unlikely(avp_debug_mask & (flag))) pr_info(args); } while (0) + #define TEGRA_AVP_NAME "tegra-avp" #define TEGRA_AVP_KERNEL_FW "nvrm_avp.bin" diff --git a/drivers/media/video/tegra/avp/avp.h b/drivers/media/video/tegra/avp/avp.h index f5e4e910097b..4f2287743a06 100644 --- a/drivers/media/video/tegra/avp/avp.h +++ b/drivers/media/video/tegra/avp/avp.h @@ -21,21 +21,6 @@ #include "trpc.h" -enum { - AVP_DBG_TRACE_XPC = 1U << 0, - AVP_DBG_TRACE_XPC_IRQ = 1U << 1, - AVP_DBG_TRACE_XPC_MSG = 1U << 2, - AVP_DBG_TRACE_XPC_CONN = 1U << 3, - AVP_DBG_TRACE_SVC = 1U << 4, - AVP_DBG_TRACE_TRPC_MSG = 1U << 5, - AVP_DBG_TRACE_TRPC_CONN = 1U << 6, - AVP_DBG_TRACE_LIB = 1U << 7, -}; - -extern u32 avp_debug_mask; -#define DBG(flag, args...) \ - do { if (unlikely(avp_debug_mask & (flag))) pr_info(args); } while (0) - struct avp_svc_info; struct avp_svc_info *avp_svc_init(struct platform_device *pdev, diff --git a/drivers/media/video/tegra/avp/avp_svc.c b/drivers/media/video/tegra/avp/avp_svc.c index 6daeed10e81e..71f7b28a4828 100644 --- a/drivers/media/video/tegra/avp/avp_svc.c +++ b/drivers/media/video/tegra/avp/avp_svc.c @@ -34,6 +34,16 @@ #include "trpc.h" #include "avp.h" +enum { + AVP_DBG_TRACE_SVC = 1U << 0, +}; + +static u32 debug_mask = 0; +module_param_named(debug_mask, debug_mask, uint, S_IWUSR | S_IRUGO); + +#define DBG(flag, args...) \ + do { if (unlikely(debug_mask & (flag))) pr_info(args); } while (0) + enum { CLK_REQUEST_VCP = 0, CLK_REQUEST_BSEA = 1, -- 2.34.1