From 1addadfe9f0043bb1e2a08ab832b3c5f261bdabe Mon Sep 17 00:00:00 2001 From: George Shen Date: Thu, 12 May 2022 11:57:54 -0700 Subject: [PATCH] msm: eva: Use Kailua GCC offset GCC_VIDEO_AXI1_CBCR relocated in kailua. The driver print the register in case fail to put NoC into low power. Change-Id: I2fd7fc57f8c7980060a79438355f704654d86f18 Signed-off-by: George Shen --- msm/eva/cvp_hfi_io.h | 4 +++- msm/eva/msm_cvp_debug.h | 14 +++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/msm/eva/cvp_hfi_io.h b/msm/eva/cvp_hfi_io.h index 1dff20eb25..de677cedbf 100644 --- a/msm/eva/cvp_hfi_io.h +++ b/msm/eva/cvp_hfi_io.h @@ -251,5 +251,7 @@ #define CVP_CC_MVS1_GDSCR (CVP_CC_BASE_OFFS + 0xCC) #define CVP_CC_MVS1_CBCR (CVP_CC_BASE_OFFS + 0xE0) -#define CVP_GCC_VIDEO_AXI1_CBCR (0x32020) +#ifdef CONFIG_EVA_KALAMA +#define CVP_GCC_VIDEO_AXI1_CBCR (0x22024) +#endif /*End of CONFIG_EVA_KALAMA */ #endif diff --git a/msm/eva/msm_cvp_debug.h b/msm/eva/msm_cvp_debug.h index 7a04951a9b..29fce7997e 100644 --- a/msm/eva/msm_cvp_debug.h +++ b/msm/eva/msm_cvp_debug.h @@ -69,20 +69,12 @@ extern bool msm_cvp_mmrm_enabled; extern bool msm_cvp_dcvs_disable; extern int msm_cvp_minidump_enable; -/* If bit 31 is set: disabling ratelimit use of pr_info */ -#define RATELIMIT_DISABLE_MASK 0x80000000 - #define dprintk(__level, __fmt, arg...) \ do { \ - if ((msm_cvp_debug & __level) \ - && (msm_cvp_debug_out == CVP_OUT_PRINTK)) { \ - if (msm_cvp_debug & RATELIMIT_DISABLE_MASK) { \ + if (msm_cvp_debug & __level) { \ + if (msm_cvp_debug_out == CVP_OUT_PRINTK) { \ pr_info(CVP_DBG_TAG __fmt, \ - get_debug_level_str(__level), \ - ## arg); \ - } else { \ - pr_info_ratelimited(CVP_DBG_TAG __fmt, \ - get_debug_level_str(__level), \ + get_debug_level_str(__level), \ ## arg); \ } \ } \